diff --git a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-27 17:25+0200\n" -"PO-Revision-Date: 2017-06-27 15:26+0000\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" +"PO-Revision-Date: 2017-11-03 15:43+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: German (http://www.transifex.com/rhodecode/RhodeCode/language/de/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" @@ -90,17 +90,86 @@ msgid "System Info" msgstr "Systeminformation" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" +msgid "Processes" msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" msgstr "Open Source Lizenzen" -#: rhodecode/apps/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "Standardeinstellungen erfolgreich aktualisiert" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "Fehler bei der Aktualisierung der Standardwerte aufgetreten" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "Anwendungs-Berechtigungen erfolgreich aktualisiert" + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "Fehler bei der Aktualisierung der Berechtigungen aufgetreten" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "Objekt-Berechtigungen erfolgreich aktualisiert" + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "Globale Berechtigungen erfolgreich aktualisiert" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "Repository-Gruppe %s erstellt" + +#: rhodecode/apps/admin/views/repo_groups.py:198 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "Fehler bei der Erstellung der Repository-Gruppe %s" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "" @@ -263,272 +332,858 @@ msgstr "" msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "Sie können diesen Benutzer nicht editieren" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "für immer" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "5 Minuten" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "1 Stunde" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "1 Tag" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "1 Monat" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "Lebensdauer" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "Benutzergruppe %(user_group_link)s erstellt" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "Fehler bei der Erstellung der Benutzergruppe %s aufgetreten" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "Benutzer %(user_link)s erstellt" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "Fehler beim Erstellen des Benutzers %s aufgetreten" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "Der Benutzer wurde erfolgreich aktualisiert" + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "Fehler bei der Aktualisierung des Benutzers %s" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "%s Repositories abgetrennt" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr "%s Repositories gelöscht" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "%s Repository-Gruppen abgetrennt" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "%s Repository-Gruppen gelöscht" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "%s Benutzergruppen abgetrennt" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "%s Benutzergruppen gelöscht" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "Benutzer erfolgreich gelöscht" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "Während der Löschen des Benutzers trat ein Fehler auf" + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "Globale Berechtigungen des Benutzers erfolgreich aktualisiert" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "Fehler beim Speichern der Berechtigungen aufgetreten" + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "Erzwungene Passwortänderung inaktiv für Benutzer" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "Erzwungene Passwortänderung aktiv für Benutzer" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "Fehler beim Zurücksetzen des Passworts für den Benutzer aufgetreten" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "Repository-Gruppe %s erstellt" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "Fehler bei der Erstellung der Repository-Gruppe aufgetreten" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "Rolle" -#: rhodecode/apps/admin/views/users.py:217 -#: rhodecode/apps/my_account/views.py:191 +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" msgstr "Authentifizierungstoken erfolgreich erstellt" -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" msgstr "Authentifizierungstoken erfolgreich gelöscht" -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "Neue E-Mail-Adresse `%s` zu Benutzerkonto hinzugefügt." -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "Währen der Speicherung der E-Mail-Adresse trat ein Fehler auf" -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" msgstr "E-Mail-Adresse von Benutzerkonto entfernt" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "Fehler beim Speichern der IP-Adresse aufgetreten: %s" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" msgstr "Fehler beim Speichern der IP-Adresse aufgetreten" -#: rhodecode/apps/admin/views/users.py:393 +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "IP-Adressen %s zur Whitelist des Benutzers hinzugefügt" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" msgstr "IP-Adressen von der Whitelist des Benutzers entfernt" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "für immer" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "5 Minuten" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "1 Stunde" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "1 Tag" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "1 Monat" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "Lebensdauer" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "Fehler bei der Erstellung des Gist aufgetreten" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "Gist %s gelöscht" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/data_table/_dt_elements.mako:323 +msgid "never" +msgstr "" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "Gist Inhalt erfolgreich aktualisiert" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "Gist Daten erfolgreich aktualisiert" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "Fehler beim Update des Gist %s aufgetreten" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 #: rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "Repositories" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "Gruppen" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "Öffentliches Journal" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "Logbuch" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:279 +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" msgstr "Du hast dich erfolgreich bei RhodeCode angemeldet" -#: rhodecode/apps/login/views.py:315 +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:321 +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:410 +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "Ihr Passwort wurde zurückgesetzt, ein neues Passwort wurde and ihre E-Mail Adresse gesendet" -#: rhodecode/apps/my_account/views.py:125 +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" msgstr "Fehler bei der Aktualisierung des Benutzerpassworts aufgetreten" -#: rhodecode/apps/my_account/views.py:132 +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" msgstr "Passwort erfolgreich aktualisiert" -#: rhodecode/apps/my_account/views.py:281 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:70 +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "Ihr Account wurde erfolgreich aktualisiert" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "Fehler beim Löschen der Repository-Gruppe %s aufgetreten" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "Es ist nicht möglich als Administrator die eigenen Berechtigungen zu ändern" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "Berechtigungen der Repository-Gruppe aktualisiert" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "Fehler bei der Aktualisierung der Repository-Gruppe %s aufgetreten" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" msgstr "Cache erfolgreich invalidiert" -#: rhodecode/apps/repository/views/repo_caches.py:74 +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "Währen der Cache Invalidierung trat ein Fehler auf" -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "Es sind noch keine Commits vorhanden" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "Repository %s von %s erstellt" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "Repository %s als %s geforkt" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "Repository %s erstellt" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "Zeige Leerzeichen" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "Ignoriere Leerzeichen" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "Status Änderung %(transition_icon)s %(status)s" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "" +"Changing the status of a commit associated with a closed pull request is not" +" allowed" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "" +"Repositories unrelated. Cannot compare commit %(commit1)s from repository " +"%(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "Änderungen im %s Repository" + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "%s %s Feed" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "Das Repository ist vom %s seit %s gesperrt" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "Klicke hier, um eine neue Datei hinzuzufügen." + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "Es sind noch keine Dateien vorhanden. %s" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "Downloads deaktiviert" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "Leeres Repository" + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "Unbekannter Archiv Typ" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "Changesets" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "Entwicklungszweige" + +#: rhodecode/apps/repository/views/repo_files.py:890 +#: rhodecode/model/scm.py:791 rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "Tags" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "Während des Committens trat ein Fehler auf" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "Keine Änderungen" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "Eine Datei wurde über RhodeCode Enterprise hinzugefügt." + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "Kein Dateiname" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "" +"The location specified must be a relative path and must not contain .. in " +"the path" +msgstr "Die spezifizierte Adresse muss ein gültiger Pfad sein und .. darf nicht teil des Pfades sein" + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "Vergleiche Fork" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Währen des Forken des Repositorys trat ein Fehler auf: %s" + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" msgstr "Repository Berechtigungen aktualisiert" +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "Commit existiert nicht" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +msgid "Pull request requires a title with min. 3 chars" +msgstr "Der Titel eines Pullrequests muss mindestens aus 3 Zeichen bestehen" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "Geschlossener Pullrequest kann nicht aktualisiert werden." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "Pullrequest Überschrift und Beschreibung aktualisiert." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "" +"Pull request updated to \"{source_commit_id}\" with {count_added} added, " +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "Seite neu laden" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "Pullrequest wurde erfolgreich zusammengeführt und geschlossen." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "Pullrequest erfolgreich gelöscht" + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" +msgstr "" + #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "Entsperrt" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "Gesperrt" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "Repository wurde %s" + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "Fehler beim Entsperren des Repositorys aufgetreten" + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "Fehler während des Löschens der Repository-Statistik aufgetreten" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "%s Forks abgetrennt" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "%s Forks gelöscht" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "" "Cannot delete `{repo}` it still contains attached forks. Try using " "{delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "Sichtbarkeit des Repositorys im öffentlichen Logbuch aktualisiert" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 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" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "Nichts" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Markiere Repository %s als Abzweig von Repository %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "Während dieser operation trat ein Fehler auf" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" msgstr "Gesperrtes Respository" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" msgstr "Entsperrtes Repository" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "Fehler beim Entsperren des Repositorys aufgetreten" - -#: rhodecode/apps/repository/views/repo_summary.py:293 +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "Fehler bei der Erstellung des Feldes aufgetreten" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "Fehler beim Löschen des Feldes aufgetreten" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "Ein Eintrag wurde aus dem Issue Tracker gelöscht." + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "Von entferntem Ort übertragen" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "Fehler während des Abrufens vom remote Speicherplatz aufgetreten" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "Einige Eingabefelder enthalten ungültige Daten." + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "VCS-Einstellungen aktualisiert" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" msgstr "Branch" -#: rhodecode/apps/repository/views/repo_summary.py:294 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" msgstr "Tag" -#: rhodecode/apps/repository/views/repo_summary.py:295 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" msgstr "Lesezeichen" -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "Entwicklungszweige" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" msgstr "Geschlossene Branches" +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "Benutzergruppe %s aktualisiert" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "Fehler bei der Aktualisierung des Benutzers %s aufgetreten" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "Benutzergruppe erfolgreich gelöscht" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "Fehler beim Löschen der Benutzergruppe aufgetreten" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "Zielgruppe kann nicht die gleiche sein" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "Berechtigungen der Benutzergruppe aktualisiert" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "Globale Berechtigungen der Benutzergruppe aktualisiert" + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" msgstr "" #: rhodecode/authentication/schema.py:35 @@ -536,21 +1191,21 @@ msgid "Enable or disable this authentica msgstr "Authentifizierungs-Plugin aktivieren/deaktivieren" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" msgstr "Aktiviert" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication responsecall for this plugin. \n" -"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:49 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" msgstr "" @@ -559,15 +1214,15 @@ msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:177 +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:187 +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." msgstr "" @@ -654,7 +1309,6 @@ msgid "The url of the Jasig CAS REST ser msgstr "" #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" @@ -693,10 +1347,11 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Passwort" @@ -787,7 +1442,7 @@ msgstr "" msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:365 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" msgstr "" @@ -820,476 +1475,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "Es sind noch keine Commits vorhanden" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "Zeige Leerzeichen" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "Ignoriere Leerzeichen" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "" - -#: rhodecode/controllers/changeset.py:343 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "Status Änderung %(transition_icon)s %(status)s" - -#: rhodecode/controllers/changeset.py:387 -msgid "" -"Changing the status of a commit associated with a closed pull request is not" -" allowed" -msgstr "" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "" -"Repositories unrelated. Cannot compare commit %(commit1)s from repository " -"%(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "Änderungen im %s Repository" - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "%s %s Feed" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "Klicke hier, um eine neue Datei hinzuzufügen." - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "Es sind noch keine Dateien vorhanden. %s" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "Das Repository ist vom %s seit %s gesperrt" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "Du kannst Dateien nur dann löschen, wenn die Revision ein gültiger Branch ist" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "Während des Committens trat ein Fehler auf" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -msgid "You can only edit files with revision being a valid branch " -msgstr "Du kannst Dateien nur dann bearbeiten, wenn die Revision ein gültiger Branch ist" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "Keine Änderungen" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "Eine Datei wurde über RhodeCode Enterprise hinzugefügt." - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "Kein Dateiname" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "" -"The location specified must be a relative path and must not contain .. in " -"the path" -msgstr "Die spezifizierte Adresse muss ein gültiger Pfad sein und .. darf nicht teil des Pfades sein" - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "Downloads deaktiviert" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "Unbekannte Revision %s" - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "Leeres Repository" - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "Unbekannter Archiv Typ" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "Changesets" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "Tags" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "Währen des Forken des Repositorys trat ein Fehler auf: %s" - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "Öffentliches Journal" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "Logbuch" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "Commit existiert nicht" - -#: rhodecode/controllers/pullrequests.py:216 -msgid "Pull request requires a title with min. 3 chars" -msgstr "Der Titel eines Pullrequests muss mindestens aus 3 Zeichen bestehen" - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "Geschlossener Pullrequest kann nicht aktualisiert werden." - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "Pullrequest Überschrift und Beschreibung aktualisiert." - -#: rhodecode/controllers/pullrequests.py:346 -msgid "" -"Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "Seite neu laden" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "Pullrequest wurde erfolgreich zusammengeführt und geschlossen." - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "Pullrequest erfolgreich gelöscht" - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "Standardeinstellungen erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "Fehler bei der Aktualisierung der Standardwerte aufgetreten" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "Fehler bei der Erstellung des Gist aufgetreten" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "Gist %s gelöscht" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "Gist Inhalt erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "Gist Daten erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "Fehler beim Update des Gist %s aufgetreten" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -msgid "never" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "" - -#: rhodecode/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 Benutzer nicht editieren, da er für die ganze Applikation von entscheidender bedeutung ist." - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "Ihr Account wurde erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "Fehler bei der Aktualisierung des Benutzers %s" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "Anwendungs-Berechtigungen erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "Fehler bei der Aktualisierung der Berechtigungen aufgetreten" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "Objekt-Berechtigungen erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "Globale Berechtigungen erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "Repository-Gruppe %s erstellt" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "Fehler bei der Erstellung der Repository-Gruppe %s" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "Repository-Gruppe %s aktualisiert" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, python-format -msgid "Error occurred during update of repository group %s" -msgstr "Fehler bei der Aktualisierung der Repository-Gruppe %s aufgetreten" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "Diese Gruppe enthält %(num)d Repository und kann nicht gelöscht werden" -msgstr[1] "Diese Gruppe enthält %(num)d Repositories und kann nicht gelöscht werden" - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "Diese Gruppe enthält %(num)d Untergruppe und kann nicht gelöscht werden" -msgstr[1] "Diese Gruppe enthält %(num)d Untergruppen und kann nicht gelöscht werden" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "Repository-Gruppe %s gelöscht" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, python-format -msgid "Error occurred during deletion of repository group %s" -msgstr "Fehler beim Löschen der Repository-Gruppe %s aufgetreten" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "Es ist nicht möglich als Administrator die eigenen Berechtigungen zu ändern" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "Berechtigungen der Repository-Gruppe aktualisiert" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "Fehler beim Erstellen des Repositorys %s: Ungültiges Zertifikat" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "Fehler beim Erstellen des Repositorys %s" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "Repository %s von %s erstellt" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "Repository %s als %s geforkt" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "Repository %s erstellt" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "Fehler bei der Erstellung des Feldes aufgetreten" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "Fehler beim Löschen des Feldes aufgetreten" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "Entsperrt" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "Gesperrt" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "Repository wurde %s" - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "Von entferntem Ort übertragen" - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "Fehler während des Abrufens vom remote Speicherplatz aufgetreten" - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "Fehler während des Löschens der Repository-Statistik aufgetreten" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "Ein Eintrag wurde aus dem Issue Tracker gelöscht." - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "Einige Eingabefelder enthalten ungültige Daten." - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "VCS-Einstellungen aktualisiert" - #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" @@ -1340,205 +1525,59 @@ msgstr "Fehler bei der Aktualisierung de msgid "Updated Labs settings" msgstr "Labs-Einstellungen aktualisiert" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "Benutzergruppe %(user_group_link)s erstellt" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "Fehler bei der Erstellung der Benutzergruppe %s aufgetreten" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "Benutzergruppe %s aktualisiert" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "Fehler bei der Aktualisierung des Benutzers %s aufgetreten" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "Benutzergruppe erfolgreich gelöscht" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "Fehler beim Löschen der Benutzergruppe aufgetreten" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "Zielgruppe kann nicht die gleiche sein" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "Berechtigungen der Benutzergruppe aktualisiert" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "Globale Berechtigungen der Benutzergruppe aktualisiert" - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "Fehler beim Speichern der Berechtigungen aufgetreten" - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "Benutzer %(user_link)s erstellt" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "Fehler beim Erstellen des Benutzers %s aufgetreten" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "Der Benutzer wurde erfolgreich aktualisiert" - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "%s Repositories abgetrennt" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr "%s Repositories gelöscht" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "%s Repository-Gruppen abgetrennt" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "%s Repository-Gruppen gelöscht" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "%s Benutzergruppen abgetrennt" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "%s Benutzergruppen gelöscht" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "Benutzer erfolgreich gelöscht" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "Während der Löschen des Benutzers trat ein Fehler auf" - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "Erzwungene Passwortänderung inaktiv für Benutzer" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "Erzwungene Passwortänderung aktiv für Benutzer" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "Fehler beim Zurücksetzen des Passworts für den Benutzer aufgetreten" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "Repository-Gruppe %s erstellt" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "Fehler bei der Erstellung der Repository-Gruppe aufgetreten" - -#: rhodecode/controllers/admin/users.py:396 -msgid "" -"The user participates as reviewer in pull requests and cannot be deleted. " -"You can set the user to \"inactive\" instead of deleting it." -msgstr "" - -#: rhodecode/controllers/admin/users.py:462 -msgid "User global permissions updated successfully" -msgstr "Globale Berechtigungen des Benutzers erfolgreich aktualisiert" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:166 +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "" @@ -1574,54 +1613,60 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 -#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "Zurücksetzen" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1660,28 +1705,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1765,17 +1810,19 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1811,132 +1858,158 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:166 -msgid "" -"URL of the webhook to receive POST event. Following variables are allowed to" -" be used: {vars}. Some of the variables would trigger multiple calls, like " +#: rhodecode/integrations/types/webhook.py:179 +msgid "" +"URL to which Webhook should submit data. Following variables are allowed to " +"be used: {vars}. Some of the variables would trigger multiple calls, like " "${{branch}} or ${{commit_id}}. Webhook will be called as many times as " "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "" +"Optional string used to validate received payloads. It will be sent together" +" with event data in JSON" msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr "[gelöscht] Repository" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "[erstellt] Repository" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "[erstellt] Repository als Fork" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "[forked] Repository" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "[aktualisiert] Repository" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "[gelöscht] Repository" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "[erstellt] Benutzer" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "[akutalisiert] Benutzer" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "[erstellt] Benutzergruppe" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "[aktualisiert] Benutzergruppe" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:148 +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "[übermittelt] in" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "[beginnt zu folgen] Repository" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "[folgt nicht mehr] Repository" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "Fork Name %s" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1947,52 +2020,42 @@ msgstr "Pullrequest #%s" msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "vergleichsansicht" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "Gelöschter Branch: %s" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "Tag erstellt: %s" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1220 +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "IP-Adresse %s nicht erlaubt" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 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" -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "Aktion wird für %s nicht unterstützt." - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" msgstr "Sie müssen angemeldet sein, um diese Seite zu betrachten" -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "" - #: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" @@ -2010,20 +2073,11 @@ msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das Diff Menü um die Unterschiede anzuzeigen" msgid "No changes detected" msgstr "Keine Änderungen erkannt" -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr "und %s weitere" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "Keine Dateien" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2043,7 +2097,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2057,54 +2111,54 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, 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" -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "jetzt gerade" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2121,24 +2175,25 @@ msgstr "jetzt gerade" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 +#: rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "Kein Zugriff auf Repository" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2155,24 +2210,25 @@ msgstr "Kein Zugriff auf Repository" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 +#: rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "Lesender Zugriff auf Repository" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2189,24 +2245,25 @@ msgstr "Lesender Zugriff auf Repository" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 +#: rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "Schreibdender Zugriff auf Repository" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2223,48 +2280,49 @@ msgstr "Schreibdender Zugriff auf Reposi #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/model/db.py:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 +#: rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "Administrativer Zugang zum Repository" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "Repository Gruppe hat Keinen Zugriff" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "Repository Gruppe hat lesenden Zugriff" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "Repository Gruppe hat schreibenden Zugriff" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "Repository Gruppe hat Administrativen Zugriff" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2280,7 +2338,7 @@ msgstr "Repository Gruppe hat Administra msgid "RhodeCode Administrator" msgstr "RhodeCode Administrator" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2297,24 +2355,25 @@ msgstr "RhodeCode Administrator" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 +#: rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "Repository erstelllung deaktiviert" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2331,24 +2390,25 @@ msgstr "Repository erstelllung deaktivie #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/model/db.py:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 +#: rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "Repository erstellung aktiviert" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2365,24 +2425,25 @@ msgstr "Repository erstellung aktiviert" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 -#: rhodecode/model/db.py:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 +#: rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "Repository Forken deaktiviert" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2399,45 +2460,46 @@ msgstr "Repository Forken deaktiviert" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 +#: rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "Repository Forken aktiviert" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "Registrierung deaktiviert" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "Registrierung neuer Benutzer in RhodeCode mit manueller Aktivierung" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "Registrierung neuer Benutzer in RhodeCode mit Automatischer Aktivierung" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2454,24 +2516,25 @@ msgstr "Registrierung neuer Benutzer in #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 -#: rhodecode/model/db.py:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 +#: rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "Nicht Begutachtet" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2488,24 +2551,25 @@ msgstr "Nicht Begutachtet" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 -#: rhodecode/model/db.py:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 +#: rhodecode/model/db.py:3325 msgid "Approved" msgstr "Akzeptiert" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2522,24 +2586,25 @@ msgstr "Akzeptiert" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 -#: rhodecode/model/db.py:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 +#: rhodecode/model/db.py:3326 msgid "Rejected" msgstr "Abgelehnt" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2556,20 +2621,21 @@ msgstr "Abgelehnt" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 -#: rhodecode/model/db.py:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 +#: rhodecode/model/db.py:3327 msgid "Under Review" msgstr "In Begutachtung" @@ -2587,20 +2653,21 @@ msgstr "In Begutachtung" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 +#: rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "" @@ -2618,20 +2685,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 +#: rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "" @@ -2649,20 +2717,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 +#: rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "" @@ -2680,20 +2749,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/model/db.py:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 +#: rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "" @@ -2710,20 +2780,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 +#: rhodecode/model/db.py:2605 msgid "User group no access" msgstr "" @@ -2740,20 +2811,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/model/db.py:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 +#: rhodecode/model/db.py:2606 msgid "User group read access" msgstr "" @@ -2770,20 +2842,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 +#: rhodecode/model/db.py:2607 msgid "User group write access" msgstr "" @@ -2800,20 +2873,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 +#: rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "" @@ -2830,20 +2904,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 +#: rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "" @@ -2860,20 +2935,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 +#: rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "" @@ -2890,20 +2966,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 +#: rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "" @@ -2920,20 +2997,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 +#: rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "" @@ -2950,20 +3028,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/model/db.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 +#: rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "" @@ -2980,20 +3059,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 -#: rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 +#: rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "" @@ -3010,20 +3090,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 +#: rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "" @@ -3040,20 +3121,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 -#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 +#: rhodecode/model/db.py:2632 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "" @@ -3070,20 +3152,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 -#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 +#: rhodecode/model/db.py:2633 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "" @@ -3094,20 +3177,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 +#: rhodecode/model/db.py:2618 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3119,20 +3203,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 +#: rhodecode/model/db.py:2619 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3141,79 +3226,74 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 +#: rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 +#: rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 -#: rhodecode/model/db.py:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "" - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 -#: rhodecode/model/db.py:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 +#: rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 -msgid "all" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 +#: rhodecode/model/db.py:1099 +msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 @@ -3222,8 +3302,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 +#: rhodecode/model/db.py:1100 +msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 @@ -3232,8 +3314,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 +#: rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 @@ -3242,36 +3326,54 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 +#: rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 +#: rhodecode/model/db.py:1103 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 -#: rhodecode/model/db.py:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 +#: rhodecode/model/db.py:2356 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 -#: rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 +#: rhodecode/model/db.py:2628 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/model/db.py:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 +#: rhodecode/model/db.py:2629 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/model/db.py:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 +#: rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3307,112 +3409,128 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:374 -msgid "made a comment" +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" msgstr "" #: rhodecode/model/comment.py:375 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "Bitte einen Benutzernamen eingeben" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Bitte einen Wert mit mindestens %(min)i Zeichen eingeben" -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "Bitte ein Passwort eingeben" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "Bitte mindestens %(min)i Zeichen eingeben" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 +#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 +#: rhodecode/model/permission.py:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "Keine" -#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 -#: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 +#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 +#: rhodecode/model/permission.py:81 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "Lesen" -#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 -#: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3420,8 +3538,8 @@ msgstr "Lesen" msgid "Write" msgstr "Schreiben" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3435,7 +3553,7 @@ msgstr "Schreiben" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3450,189 +3568,189 @@ msgstr "Schreiben" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "Admin" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "Deaktiviert" -#: rhodecode/model/permission.py:86 +#: rhodecode/model/permission.py:87 msgid "Allowed with manual account activation" msgstr "" -#: rhodecode/model/permission.py:87 +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "" -#: rhodecode/model/permission.py:90 -msgid "Allow password recovery" -msgstr "" - #: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" +msgid "Allow password recovery" msgstr "" #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:119 +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:121 +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:123 +#: rhodecode/model/pull_request.py:122 msgid "" "Pull request cannot be updated because the reference type is not supported " "for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:126 +#: rhodecode/model/pull_request.py:125 msgid "" "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:129 +#: rhodecode/model/pull_request.py:128 msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "Pullrequest zusammengeführt und geschlossen" - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 -msgid "Server-side pull request merging is disabled." -msgstr "" - -#: rhodecode/model/pull_request.py:1154 -msgid "This pull request is closed." -msgstr "" - #: rhodecode/model/pull_request.py:1166 +msgid "Server-side pull request merging is disabled." +msgstr "" + +#: rhodecode/model/pull_request.py:1168 +msgid "This pull request is closed." +msgstr "" + +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "Lesezeichen" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "Reviewer Zustimmung fehlt." -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "" @@ -3640,32 +3758,32 @@ msgstr "" 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." -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 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." -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "" -#: rhodecode/model/user.py:519 +#: rhodecode/model/user.py:523 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "" -#: rhodecode/model/user.py:528 +#: rhodecode/model/user.py:532 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3717,7 +3835,7 @@ msgstr "" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" +msgid "User group `%(usergroup)s` already exists" msgstr "" #: rhodecode/model/validators.py:226 @@ -3964,27 +4082,27 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "" "You do not have the permission to store repository groups in the root " "location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4024,440 +4142,454 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "Keine Treffer gefunden" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "Bitte {0} oder mehr Zeichen eingeben" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "Bitte {0} oder mehr Zeichen eingeben" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "Bitte {0} Zeichen löschen" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "Bitte {0} Zeichen löschen" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" @@ -4470,7 +4602,7 @@ msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" @@ -4478,141 +4610,159 @@ msgstr "" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this " +"page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No branches available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No gists available yet." +msgid "No bookmarks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" +msgid "No user groups available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "Senden" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Updating..." +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "" +"There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" msgstr "" @@ -4648,13 +4798,14 @@ msgstr "Übersichtsseite" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "Schnellfilter..." @@ -4686,19 +4837,19 @@ msgid "Edit Repository Group" msgstr "" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4708,12 +4859,15 @@ msgid "Name" msgstr "Name" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4721,13 +4875,15 @@ msgstr "Name" #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4735,48 +4891,51 @@ msgstr "Name" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "Beschreibung" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "Letzte Änderung" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "Besitzer" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "Letzte Änderung" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4793,7 +4952,7 @@ msgid "Home" msgstr "" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Einloggen" @@ -4907,6 +5066,70 @@ msgstr "" msgid "Create Account" msgstr "" +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "Datum" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "Aktion" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "Repository" + #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 msgid "Admin audit logs" @@ -4917,68 +5140,34 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:68 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "Aktion" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "Repository" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "Datum" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" msgstr "Es sind bisher keine Aktionen passiert" @@ -5016,13 +5205,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -5050,21 +5239,21 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 -#: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Typ" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -5119,7 +5308,7 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "" @@ -5130,15 +5319,15 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:122 +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " @@ -5171,7 +5360,7 @@ msgid "All Public Gists" msgstr "" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" msgstr "" @@ -5196,14 +5385,14 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5212,6 +5401,7 @@ msgid "Author" msgstr "" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5220,7 +5410,7 @@ msgid "Created on" msgstr "" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "" @@ -5254,44 +5444,33 @@ msgstr "" msgid "Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:56 -#: rhodecode/templates/admin/integrations/list.mako:204 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:60 -#: rhodecode/templates/data_table/_dt_elements.mako:118 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#: rhodecode/templates/data_table/_dt_elements.mako:193 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "" @@ -5304,7 +5483,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "" @@ -5317,7 +5496,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 #: rhodecode/templates/base/base.mako:84 -#: rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Einstellungen" @@ -5339,67 +5518,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "Alle" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:115 -msgid "No {type} integrations for repo {repo} exist yet." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:117 -msgid "No {type} integrations for repogroup {repogroup} exist yet." -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:119 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:121 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5415,12 +5594,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "Mein Account" @@ -5439,26 +5618,35 @@ msgstr "" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "E-Mails" -#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/my_account/my_account.mako:40 msgid "Watched" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:40 -#: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:241 -msgid "Pull Requests" -msgstr "" - #: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 +msgid "Pull Requests" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5467,7 +5655,7 @@ msgstr "" msgid "Permissions" msgstr "Rechte" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5517,16 +5705,23 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "Hinzufügen" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5618,11 +5813,11 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5631,7 +5826,7 @@ msgstr "" msgid "Title" msgstr "Titel" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5640,41 +5835,97 @@ msgstr "" msgid "Repositories You Own" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "" +"SSH Keys usage is currently disabled, please ask your administrator to " +"enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "" +"Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-" +"sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "Bisher gibt es keine Benachrichtigungen" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "Zeige Benachrichtigung" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "Meine Benachrichtigungen" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 +msgid "Mark all as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 msgid "Comments" msgstr "Kommentare" -#: rhodecode/templates/admin/notifications/notifications.mako:37 -msgid "Mark all as read" -msgstr "" - -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "Bisher gibt es keine Benachrichtigungen" - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "Zeige Benachrichtigung" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "Benachrichtigungen" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5692,6 +5943,10 @@ msgid "IP Whitelist" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "" @@ -5732,32 +5987,45 @@ msgstr "" msgid "External Authentication Account Activation" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5812,6 +6080,14 @@ msgstr "" msgid "Default User Permissions Overview" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "" @@ -5828,16 +6104,21 @@ msgstr "" msgid "Group Name" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "" @@ -5853,7 +6134,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "" @@ -5882,20 +6163,6 @@ msgstr "" msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" @@ -5905,64 +6172,64 @@ msgstr "" msgid "Delete this repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." @@ -5973,19 +6240,23 @@ msgstr "" msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " @@ -6000,7 +6271,7 @@ msgstr "" msgid "repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "" @@ -6017,51 +6288,51 @@ msgstr "" msgid "Clone from" msgstr "Clone von" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "" +"Plain text format with support of {metatags}. Add a README file for longer " +"descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:79 -msgid "Set the type of repository to create." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" +msgid "{} Creating repository" msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 @@ -6093,7 +6364,7 @@ msgid "Remote" msgstr "Entfernt" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "Statistiken" @@ -6202,7 +6473,7 @@ msgid "Delete forks" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" @@ -6227,6 +6498,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6265,7 +6545,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 @@ -6453,8 +6733,8 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "Repository Gruppe" @@ -6472,9 +6752,9 @@ msgid "Remote uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "bearbeiten" @@ -6509,32 +6789,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "Privates Repository" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "Aktiviere Statistiken" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "Aktiviere Downloads" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -6629,7 +6909,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "Einstellungen speichern" @@ -6729,7 +7009,7 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6914,6 +7194,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "Suche nach Updates..." + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6971,10 +7260,6 @@ msgid "" "custom size" msgstr "" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "Suche nach Updates..." - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7043,97 +7328,97 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:66 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." -msgstr "Parst Meta-Tags aus der Repository-Beschreibung und erstellt farbige Tags." - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +"Parses meta tags from repository or repository group description fields and " +"turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "" "Number of items displayed in the main page dashboard before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:117 +#: rhodecode/templates/admin/settings/settings_visual.mako:106 msgid "Commit ID Style" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:121 +#: rhodecode/templates/admin/settings/settings_visual.mako:110 msgid "Commit sha length" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:128 +#: rhodecode/templates/admin/settings/settings_visual.mako:117 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "Icons" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "Icon für öffentliche Repositories anzeigen" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "Icon für private Repositories anzeigen" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "Icons für öffentliche/private Repositories neben dem Namen anzeigen" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "" "Default renderer used to render comments, pull request descriptions and " "other description elements. After change old entries will still work " "correctly." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -7143,11 +7428,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7188,17 +7473,17 @@ msgid "%s user group settings" msgstr "%s Benutzergruppen Einstellungen" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "Globale Berechtigungen" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "Berechtigungsübersicht" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "Mitglieder" @@ -7215,54 +7500,59 @@ msgstr "Zugewiesen zu Repositories" msgid "Assigned to repo groups" msgstr "Zugewiesen zu Repository-Gruppen" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "Benutzergruppe: %s" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 -msgid "This group is set to be automatically synchronised." -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 +msgid "This group is set to be automatically synchronised." +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "" "Users will be added or removed from this group when they authenticate with " "RhodeCode system, based on LDAP group membership. This requires `LDAP+User " "group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, python-format msgid "" "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "Bestägigen dass die Benutzergrupe `%(ugroup)s` mit allen Berechtigungen gelöscht werden soll" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "" @@ -7296,7 +7586,7 @@ msgstr "Verwaltung der Benutzergruppen" msgid "user groups" msgstr "Benutzergruppen" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7336,7 +7626,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7367,16 +7657,12 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "User Groups Management" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" +msgid "User Groups Management" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 @@ -7390,107 +7676,91 @@ msgstr "Letzte Anmeldung" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "Letzte Aktivität" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "Mitglied in Benutzergruppen" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "Erzwinge Passwortänderung" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "Benutzer: %s" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "" "When this is enabled user will have to change they password when they next " "use RhodeCode system. This will also forbid vcs operations until someone " "makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 msgid "Users personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "Erstelle persönliche Repository-Gruppe" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "Repositories abtrennen" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "Repositories löschen" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "Repository-Gruppen abtrennen" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "Benutzergruppen abtrennen" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "Bestätigen den Benutzer %s zu löschen" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "Lösche diesen Benutzer" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "" "When selecting the detach option, the depending objects owned by this user " @@ -7502,10 +7772,6 @@ msgstr "" msgid "User Audit Logs" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 -msgid "audit filter..." -msgstr "" - #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "Weitere E-Mail-Adressen" @@ -7524,10 +7790,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7584,6 +7846,29 @@ msgstr "" msgid "Help translate %(rc_link)s into your language." msgstr "" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "" +"Below is a 2048 bit generated SSH RSA key. You can use it to access " +"RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" msgstr "Benutzerverwaltung" @@ -7625,141 +7910,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: rhodecode/templates/base/base.mako:228 -#: rhodecode/templates/data_table/_dt_elements.mako:12 -#: rhodecode/templates/data_table/_dt_elements.mako:13 -#: rhodecode/templates/data_table/_dt_elements.mako:153 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "Zusammenfassung" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Dateien" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Vergleiche" -#: rhodecode/templates/base/base.mako:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "Zeige Pullrequests für %s" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "Optionen" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "Vergleiche Fork" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Suche" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "Entsperren" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "Sperren" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "Fork" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "Pullrequest erstellen" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "Anmelden" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "(Kennwort vergessen?)" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "Logbuch" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "Logbuch" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 -msgid "Public journal" -msgstr "Öffentliches Logbuch" - #: rhodecode/templates/base/base.mako:400 -msgid "Show Gists" -msgstr "" - -#: rhodecode/templates/base/base.mako:401 -msgid "Gists" -msgstr "" +msgid "Public journal" +msgstr "Öffentliches Logbuch" #: rhodecode/templates/base/base.mako:405 +msgid "Show Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:406 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7781,15 +8066,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "" @@ -7899,9 +8184,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "" @@ -7909,77 +8194,94 @@ msgstr "" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "keine" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "lesen" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "schreiben" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "admin" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "Rechte" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:85 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 +msgid "Repository default permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:120 +msgid "Repository group default permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:123 +msgid "User group default permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:126 msgid "Super admin" msgstr "Super-Administrator" -#: rhodecode/templates/base/perms_summary.mako:87 -msgid "Repository default permission" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:88 -msgid "Repository group default permission" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:89 -msgid "User group default permission" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8102,93 +8404,74 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "" -"These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "" -"Use rebase instead of creating a merge commit when merging via web " -"interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "" "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -8196,16 +8479,40 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." msgstr "" +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "" +"Use rebase instead of creating a merge commit when merging via web " +"interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "" +"Close branch before merging it into destination branch. No effect when " +"rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -8220,8 +8527,8 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -8242,8 +8549,8 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -8255,55 +8562,54 @@ msgstr "" msgid "%s Changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "" @@ -8321,8 +8627,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8335,43 +8640,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8379,7 +8689,7 @@ msgstr "" msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8392,102 +8702,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 +#: rhodecode/templates/changeset/changeset.mako:142 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:140 -msgid "Raw Diff" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:143 +msgid "Raw Diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:144 -msgid "Patch Diff" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:147 +msgid "Patch Diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8557,12 +8849,12 @@ msgid "Leave a comment on this Commit." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "" @@ -8582,7 +8874,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" @@ -8600,15 +8892,8 @@ msgstr "" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8620,31 +8905,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8652,8 +8919,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -8661,8 +8928,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" msgstr "" @@ -8675,68 +8942,50 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "" -"%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:118 +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "" +"This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "" -"This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:415 #: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format @@ -8795,7 +9044,7 @@ msgstr "" msgid "Wide Mode Diff" msgstr "" -#: rhodecode/templates/codeblocks/source.mako:24 +#: rhodecode/templates/codeblocks/source.mako:25 msgid "view annotation from before this change" msgstr "" @@ -8808,25 +9057,11 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" msgstr "" @@ -8836,13 +9071,6 @@ msgstr "" msgid "%s Compare" msgstr "" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 @@ -8856,14 +9084,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "" @@ -8887,72 +9115,69 @@ msgstr "" msgid "Compare commits, branches, bookmarks or tags." msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:49 +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "Öffenentliches Repository" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "Abonniere den %s RSS Feed" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "Abonniere den %s ATOM Feed" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, 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] "" - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" @@ -9254,13 +9479,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -9276,13 +9494,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9318,13 +9529,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9392,22 +9596,22 @@ msgid "Create New File" msgstr "" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "" @@ -9462,14 +9666,14 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " msgstr "" #: rhodecode/templates/files/files_delete.mako:70 @@ -9519,15 +9723,15 @@ msgstr "" msgid "annotation" msgstr "" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" msgstr "" -#: rhodecode/templates/files/files_edit.mako:74 +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "" @@ -9535,62 +9739,55 @@ msgstr "" msgid "Location" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 -msgid "Annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 -msgid "Raw" -msgstr "" - #: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 +msgid "Annotation" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 +msgid "Raw" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9604,22 +9801,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "" -#: rhodecode/templates/forks/fork.mako:97 -msgid "Copy permissions from forked repository" -msgstr "" - #: rhodecode/templates/forks/fork.mako:102 +msgid "Copy permissions from forked repository" +msgstr "" + +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "" @@ -9632,34 +9830,23 @@ msgstr "" msgid "Forks" msgstr "" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "" - -#: rhodecode/templates/journal/journal.mako:13 -msgid "Filter" -msgstr "" - #: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/journal/journal.mako:23 +msgid "Filter" +msgstr "" + +#: rhodecode/templates/journal/journal.mako:24 msgid "ATOM journal feed" msgstr "ATOM Logbuch Feed" -#: rhodecode/templates/journal/journal.mako:24 +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "RSS Logbuch Feed" @@ -9668,15 +9855,15 @@ msgid "No entries yet" msgstr "" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "Öffentliches Logbuch" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "ATOM Feed für das Öffentliche Logbuch" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "RSS Feed für das Öffentliche Logbuch" @@ -9706,22 +9893,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9734,13 +9921,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9765,26 +9945,26 @@ msgstr "" msgid "Merge is not currently possible because of below failed checks." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9805,171 +9985,175 @@ msgstr "" msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 -#, python-format -msgid "calculated based on %s reviewer vote" -msgid_plural "calculated based on %s reviewers votes" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 -msgid "{} version available for this pull request, show it." -msgid_plural "{} versions available for this pull request, show them." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 -#, python-format -msgid "%d General " -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 +msgid "Mandatory reviewer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "" "These commits cannot be displayed, because this repository uses the " "Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 msgid "" "This pull request cannot be displayed, because one or more commits no longer" " exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 msgid "" "Please update this pull request, push the commits back into the source " "repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 msgid "" "Commits and changes between v{ver_from} and {ver_to} of this pull request, " "commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -10072,7 +10256,7 @@ msgstr "" msgid "Age (old first)" msgstr "" -#: rhodecode/templates/search/search_content.mako:33 +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "" @@ -10080,84 +10264,74 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 -msgid "Show by Name" -msgstr "" - -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 -msgid "Show by ID" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -msgid "SVN Protocol is disabled. To enable it, see the" -msgstr "" - #: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 +msgid "Show by Name" +msgstr "" + +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 +msgid "Show by ID" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 +msgid "SVN Protocol is disabled. To enable it, see the" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "Die Statistik ist für dieses Repository deaktiviert" -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" msgstr "" @@ -10175,6 +10349,21 @@ msgstr "" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" msgstr "" diff --git a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-27 17:25+0200\n" -"PO-Revision-Date: 2017-06-27 15:26+0000\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" +"PO-Revision-Date: 2017-11-03 15:43+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Spanish (http://www.transifex.com/rhodecode/RhodeCode/language/es/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" @@ -88,17 +88,86 @@ msgid "System Info" msgstr "" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" +msgid "Processes" msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "Ajustes por defecto actualizados exitosamente" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "Error ocurrido durante actalización de valores por defecto" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "Permisos de aplicación actualizados exitosamente" + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "Error ocurrido durante actualización de permisos" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "Permisos de objeto actualizados exitosamente" + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "Permisos globales actualizado exitosamente" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "Se creó grupo de repositorio %s" + +#: rhodecode/apps/admin/views/repo_groups.py:198 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "Error ocurrido durante creación de grupo de repositorio %s" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "" @@ -261,272 +330,858 @@ msgstr "" msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "Usted no puede editar este usuario" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "para siempre" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "5 minutos" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "1 hora" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "1 día" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "1 mes" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "De por vida" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "Se creó grupo de usuario %(user_group_link)s" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "Error ocurrido al crear grupo de usuario %s" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "Se creó usuario %(user_link)s" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "Error ocurrido durante creación de usuario %s" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "Usuario actualizado exitosamente" + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "Error ocurrido durante actualización de usuario %s" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "Se elminaron %s grupos de repositorio" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "Se eliminaron %s grupos de usuario" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "Se eliminó usuario exitosamente" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "Ocurrió un error durante eliminación de usuario" + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "Permisos globales de usario actualizados exitosamente" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "Ocurrió un error al guardar permisos" + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "Forzar cambio de contraseña deshabilitado para usuario" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "Forzar cambio de contraseña habilitado para usuario" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "Ocurrió un error durante reinicio de contraseña para usuario" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "Se creó grupo de repositorio `%s`" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "Ocurrió un error durante creación de grupo de repositorio para usuario" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "Rol" -#: rhodecode/apps/admin/views/users.py:217 -#: rhodecode/apps/my_account/views.py:191 +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" msgstr "Ficha de autenticación creada exitosamente" -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" msgstr "Ficha de autenticación eliminada exitosamente" -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "Ocurrió un error durante guardado de correo electrónico" -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "Ocurrió un error al guardar ip:%s" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" msgstr "Ocurrió un error al guardar ip" -#: rhodecode/apps/admin/views/users.py:393 +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "Se agregaron ips %s a la lista blanca de usuario" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" msgstr "Se eliminó dirección ip de lista blanca de usuario" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "para siempre" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "5 minutos" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "1 hora" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "1 día" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "1 mes" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "De por vida" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "Requiere cuenta registrada" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "Puede ser accesado por usuarios anónimos" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "Error ocurrido durante creación de quid" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "Se eliminó quid %s" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/data_table/_dt_elements.mako:323 +msgid "never" +msgstr "nunca" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "%(expiry)s - valor actual" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "Se actualizó exitosamente el contenido de quid" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "Se actualizaron exitosamente los datos de quid" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "Error ocurrido durante actualización de quid %s" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 #: rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "Repositorios" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "Grupos" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "diario público" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "diario" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:279 +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" msgstr "Se ha registrado exitosamente con RhodeCode" -#: rhodecode/apps/login/views.py:315 +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:321 +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:410 +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "Su reinicio de contraseña fue exitoso, una nueva contraseña ha sido enviada a su correo electrónico" -#: rhodecode/apps/my_account/views.py:125 +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" msgstr "Error ocurrido durante actualización de contraseña de usuario" -#: rhodecode/apps/my_account/views.py:132 +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" msgstr "Contraseña actualizada exitosamente" -#: rhodecode/apps/my_account/views.py:281 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:70 +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "Su cuenta fue actualizada exitosamente" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "Error ocurrido durante eliminación de grupo de repositorio %s" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "No puede cambiar el permiso para usted como admin" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "Permisos de Grupo de Repositorio actualizados" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "Error ocurrido durante actualización de grupo de repositorio %s" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" msgstr "Invalidación de caché exitosa" -#: rhodecode/apps/repository/views/repo_caches.py:74 +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "Ocurrió un error durante invalidación de caché" -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "No hay cometidos todavía" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "Se creó repositorio %s a base de %s" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "Se bifurcó repositorio %s como %s" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "Se creó repositorio %s" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "Mostrar espacio" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "Mostrar espacio para todas las diferencias" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "Ignorar espacio" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "Ignorar espacio para todas las diferencias" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "Incrementar contexto" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "Incrementar contexto para todas las diferencias" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "Cambio de estado %(transition_icon)s %(status)s" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "" +"Changing the status of a commit associated with a closed pull request is not" +" allowed" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "" +"Repositories unrelated. Cannot compare commit %(commit1)s from repository " +"%(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "Cambios en repositorio %s" + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "%s %s fuente" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "El repositorio ha sido bloqueado por %s en %s" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "No hay archivos todavía. %s" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "Descargas deshabilitadas" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "Repositorio vacío" + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "Typo de archivo desconocido" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "Conjuntos de cambios" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "Ramas" + +#: rhodecode/apps/repository/views/repo_files.py:890 +#: rhodecode/model/scm.py:791 rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "Etiquetas" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "Error occurrido durante cometido" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "Sin cambios" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "Se agregó archivo vía RhodeCode Enterprise" + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "Sin nombre de archivo" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "" +"The location specified must be a relative path and must not contain .. in " +"the path" +msgstr "La localización específica debe ser una ruta relativa y no deve contener .. en la ruta" + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Ocurrió un error durante bifurcación de repositorio %s" + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" msgstr "Permisos de repositorio actualizados" +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +msgid "Pull request requires a title with min. 3 chars" +msgstr "La solicitud de extracción requiere un título con un mínimo de 3 caracteres" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "Se abrió nueva solicitud de extracción exitosamente" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "No se pueden actualizar solicitudes de extracción cerradas." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "Título de solicitud de extracción & descripción actualizados." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "" +"Pull request updated to \"{source_commit_id}\" with {count_added} added, " +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "Se eliminó la solicitud de extracción exitosamente" + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" +msgstr "" + #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "Desbloqueado" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "Bloqueado" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "El repositorio ha sido %s" + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "Ocurrió un error durante desbloqueo" + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "Ocurrió un error durante eliminacion de estadísticas de repositorio" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "Se despegaron %s bifurcaciones" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "Se eliminaron %s bifurcaciones" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "" "Cannot delete `{repo}` it still contains attached forks. Try using " "{delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "Se actualizó visibilidad de repositorio en diario público" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 msgid "An error occurred during setting this repository in public journal" msgstr "Ocurrió un error al ajustar este repositorio en diario público" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "Nada" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Se marcó repositorio %s como bifurcación de %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "Ocurrió un error durante esta operación" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" msgstr "Repositorio blockeado" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" msgstr "Repositorio desbloqueado" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "Ocurrió un error durante desbloqueo" - -#: rhodecode/apps/repository/views/repo_summary.py:293 +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "Ocurrió un error durante creación de campo" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "Ocurrió un error durante remoción de campo" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "Error ocurrido al eliminar entrada en el seguidor de incidencias" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "Se eliminó entrada en el seguidor de incidencias" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "Se actualizaron entradas en el seguidor de incidencias" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "Extraído de localidad remota" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "Ocurrió un error durante extracción de localidad remota" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "Algunos campos de entrada contienen datos inválidos" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "Se actualizaron ajustes VCS" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "Error ocurrido al actualizar ajustes VCS del repositorio" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" msgstr "Rama" -#: rhodecode/apps/repository/views/repo_summary.py:294 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" msgstr "Etiqueta" -#: rhodecode/apps/repository/views/repo_summary.py:295 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" msgstr "Marcador" -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "Ramas" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" msgstr "Ramas cerradas" +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "Se actualizó grupo de usuario %s" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "Error ocurrido al actualizar group de usuario %s" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "Grupo de usuario eliminado exitosamente" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "Ocurrió un error durante eliminación de grupo de usuario" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "El grupo de destino no puede ser el mismo" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "Permisos de grupo de usuario actualizados" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "Permisos globales para Grupo de Usuario actualizados exitosamente" + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" msgstr "" #: rhodecode/authentication/schema.py:35 @@ -534,21 +1189,21 @@ msgid "Enable or disable this authentica msgstr "" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" msgstr "" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication responsecall for this plugin. \n" -"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:49 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" msgstr "" @@ -557,15 +1212,15 @@ msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:177 +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:187 +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." msgstr "" @@ -652,7 +1307,6 @@ msgid "The url of the Jasig CAS REST ser msgstr "" #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" @@ -691,10 +1345,11 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "" @@ -785,7 +1440,7 @@ msgstr "" msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:365 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" msgstr "" @@ -818,476 +1473,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "No hay cometidos todavía" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "Mostrar espacio" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "Mostrar espacio para todas las diferencias" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "Ignorar espacio" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "Ignorar espacio para todas las diferencias" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "Incrementar contexto" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "Incrementar contexto para todas las diferencias" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "" - -#: rhodecode/controllers/changeset.py:343 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "Cambio de estado %(transition_icon)s %(status)s" - -#: rhodecode/controllers/changeset.py:387 -msgid "" -"Changing the status of a commit associated with a closed pull request is not" -" allowed" -msgstr "" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "" -"Repositories unrelated. Cannot compare commit %(commit1)s from repository " -"%(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "Cambios en repositorio %s" - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "%s %s fuente" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "" - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "No hay archivos todavía. %s" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "El repositorio ha sido bloqueado por %s en %s" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "Sólo puede eliminar archivos con revisión siendo una rama válida" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "Error occurrido durante cometido" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -msgid "You can only edit files with revision being a valid branch " -msgstr "Usted puede editar solamente archivos con revision siendo una rama válida" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "Sin cambios" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "Se agregó archivo vía RhodeCode Enterprise" - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "Sin nombre de archivo" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "" -"The location specified must be a relative path and must not contain .. in " -"the path" -msgstr "La localización específica debe ser una ruta relativa y no deve contener .. en la ruta" - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "Descargas deshabilitadas" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "Revision desconocida %s" - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "Repositorio vacío" - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "Typo de archivo desconocido" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "Conjuntos de cambios" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "Etiquetas" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "Ocurrió un error durante bifurcación de repositorio %s" - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "diario público" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "diario" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:216 -msgid "Pull request requires a title with min. 3 chars" -msgstr "La solicitud de extracción requiere un título con un mínimo de 3 caracteres" - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "Se abrió nueva solicitud de extracción exitosamente" - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "No se pueden actualizar solicitudes de extracción cerradas." - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "Título de solicitud de extracción & descripción actualizados." - -#: rhodecode/controllers/pullrequests.py:346 -msgid "" -"Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "Se eliminó la solicitud de extracción exitosamente" - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "Ajustes por defecto actualizados exitosamente" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "Error ocurrido durante actalización de valores por defecto" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "Requiere cuenta registrada" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "Puede ser accesado por usuarios anónimos" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "Error ocurrido durante creación de quid" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "Se eliminó quid %s" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "Se actualizó exitosamente el contenido de quid" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "Se actualizaron exitosamente los datos de quid" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "Error ocurrido durante actualización de quid %s" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -msgid "never" -msgstr "nunca" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "%(expiry)s - valor actual" - -#: rhodecode/controllers/admin/my_account.py:70 -msgid "You can't edit this user since it's crucial for entire application" -msgstr "Usted no puede editar este usuario porque es crucial para la aplicación entera" - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "Su cuenta fue actualizada exitosamente" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "Error ocurrido durante actualización de usuario %s" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "Permisos de aplicación actualizados exitosamente" - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "Error ocurrido durante actualización de permisos" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "Permisos de objeto actualizados exitosamente" - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "Permisos globales actualizado exitosamente" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "Se creó grupo de repositorio %s" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "Error ocurrido durante creación de grupo de repositorio %s" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "Se actualizó grupo de repositorio %s" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, python-format -msgid "Error occurred during update of repository group %s" -msgstr "Error ocurrido durante actualización de grupo de repositorio %s" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "Este grupo contiene %(num)d repositorio y no puede ser eliminado" -msgstr[1] "Este grupo contiene %(num)d repositorios y no puede ser eliminado" - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "Este grupo contiene %(num)d subgrupo y no puede ser eliminado" -msgstr[1] "Este grupo contiene %(num)d subgrupos y no puede ser eliminado" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "Se removió grup de repositorio %s" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, python-format -msgid "Error occurred during deletion of repository group %s" -msgstr "Error ocurrido durante eliminación de grupo de repositorio %s" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "No puede cambiar el permiso para usted como admin" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "Permisos de Grupo de Repositorio actualizados" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "Error al crear repositorio %s: certificado inválido" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "Error al crear repositorio %s" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "Se creó repositorio %s a base de %s" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "Se bifurcó repositorio %s como %s" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "Se creó repositorio %s" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "Ocurrió un error durante creación de campo" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "Ocurrió un error durante remoción de campo" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "Desbloqueado" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "Bloqueado" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "El repositorio ha sido %s" - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "Extraído de localidad remota" - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "Ocurrió un error durante extracción de localidad remota" - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "Ocurrió un error durante eliminacion de estadísticas de repositorio" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "Error ocurrido al eliminar entrada en el seguidor de incidencias" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "Se eliminó entrada en el seguidor de incidencias" - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "Se actualizaron entradas en el seguidor de incidencias" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "Algunos campos de entrada contienen datos inválidos" - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "Error ocurrido al actualizar ajustes VCS del repositorio" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "Se actualizaron ajustes VCS" - #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" @@ -1338,205 +1523,59 @@ msgstr "Error ocurrido al actiualizar aj msgid "Updated Labs settings" msgstr "Se Actualizaron Ajustes de Laboratorios" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "Se creó grupo de usuario %(user_group_link)s" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "Error ocurrido al crear grupo de usuario %s" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "Se actualizó grupo de usuario %s" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "Error ocurrido al actualizar group de usuario %s" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "Grupo de usuario eliminado exitosamente" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "Ocurrió un error durante eliminación de grupo de usuario" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "El grupo de destino no puede ser el mismo" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "Permisos de grupo de usuario actualizados" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "Permisos globales para Grupo de Usuario actualizados exitosamente" - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "Ocurrió un error al guardar permisos" - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "Se creó usuario %(user_link)s" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "Error ocurrido durante creación de usuario %s" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "Usuario actualizado exitosamente" - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "Se elminaron %s grupos de repositorio" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "Se eliminaron %s grupos de usuario" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "Se eliminó usuario exitosamente" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "Ocurrió un error durante eliminación de usuario" - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "Forzar cambio de contraseña deshabilitado para usuario" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "Forzar cambio de contraseña habilitado para usuario" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "Ocurrió un error durante reinicio de contraseña para usuario" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "Se creó grupo de repositorio `%s`" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "Ocurrió un error durante creación de grupo de repositorio para usuario" - -#: rhodecode/controllers/admin/users.py:396 -msgid "" -"The user participates as reviewer in pull requests and cannot be deleted. " -"You can set the user to \"inactive\" instead of deleting it." -msgstr "" - -#: rhodecode/controllers/admin/users.py:462 -msgid "User global permissions updated successfully" -msgstr "Permisos globales de usario actualizados exitosamente" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:166 +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "" @@ -1572,54 +1611,60 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 -#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1658,28 +1703,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1763,17 +1808,19 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1809,132 +1856,158 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:166 -msgid "" -"URL of the webhook to receive POST event. Following variables are allowed to" -" be used: {vars}. Some of the variables would trigger multiple calls, like " +#: rhodecode/integrations/types/webhook.py:179 +msgid "" +"URL to which Webhook should submit data. Following variables are allowed to " +"be used: {vars}. Some of the variables would trigger multiple calls, like " "${{branch}} or ${{commit_id}}. Webhook will be called as many times as " "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "" +"Optional string used to validate received payloads. It will be sent together" +" with event data in JSON" msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr "[deleted] repositorio" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "[created] repositorio" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "[created] repositorio como bifurcación" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "[forked] repositorio" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "[updated] repositorio" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:148 +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "Nombre de bifurcación %s" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1945,52 +2018,42 @@ msgstr "Solicitud de extracción #%s" msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "comparar vista" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "Se eliminó rama: %s" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1220 +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "IP %s no permitida" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 msgid "You need to be a registered user to perform this action" msgstr "Usted necesita ser un usuario registrado para llevar a cabo esta acción" -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "Acción no soportada para %s" - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" msgstr "Usted necesita estar en sesión para ver esta página" -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "" - #: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" @@ -2008,20 +2071,11 @@ msgstr "" msgid "No changes detected" msgstr "" -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr "" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2041,7 +2095,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2055,54 +2109,54 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, 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 "" -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2119,24 +2173,25 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 +#: rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2153,24 +2208,25 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 +#: rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2187,24 +2243,25 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 +#: rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2221,48 +2278,49 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/model/db.py:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 +#: rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2278,7 +2336,7 @@ msgstr "" msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2295,24 +2353,25 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 +#: rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2329,24 +2388,25 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/model/db.py:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 +#: rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2363,24 +2423,25 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 -#: rhodecode/model/db.py:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 +#: rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2397,45 +2458,46 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 +#: rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2452,24 +2514,25 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 -#: rhodecode/model/db.py:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 +#: rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2486,24 +2549,25 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 -#: rhodecode/model/db.py:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 +#: rhodecode/model/db.py:3325 msgid "Approved" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2520,24 +2584,25 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 -#: rhodecode/model/db.py:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 +#: rhodecode/model/db.py:3326 msgid "Rejected" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2554,20 +2619,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 -#: rhodecode/model/db.py:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 +#: rhodecode/model/db.py:3327 msgid "Under Review" msgstr "" @@ -2585,20 +2651,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 +#: rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "" @@ -2616,20 +2683,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 +#: rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "" @@ -2647,20 +2715,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 +#: rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "" @@ -2678,20 +2747,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/model/db.py:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 +#: rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "" @@ -2708,20 +2778,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 +#: rhodecode/model/db.py:2605 msgid "User group no access" msgstr "" @@ -2738,20 +2809,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/model/db.py:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 +#: rhodecode/model/db.py:2606 msgid "User group read access" msgstr "" @@ -2768,20 +2840,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 +#: rhodecode/model/db.py:2607 msgid "User group write access" msgstr "" @@ -2798,20 +2871,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 +#: rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "" @@ -2828,20 +2902,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 +#: rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "" @@ -2858,20 +2933,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 +#: rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "" @@ -2888,20 +2964,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 +#: rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "" @@ -2918,20 +2995,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 +#: rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "" @@ -2948,20 +3026,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/model/db.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 +#: rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "" @@ -2978,20 +3057,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 -#: rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 +#: rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "" @@ -3008,20 +3088,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 +#: rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "" @@ -3038,20 +3119,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 -#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 +#: rhodecode/model/db.py:2632 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "" @@ -3068,20 +3150,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 -#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 +#: rhodecode/model/db.py:2633 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "" @@ -3092,20 +3175,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 +#: rhodecode/model/db.py:2618 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3117,20 +3201,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 +#: rhodecode/model/db.py:2619 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3139,79 +3224,74 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 +#: rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 +#: rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 -#: rhodecode/model/db.py:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "" - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 -#: rhodecode/model/db.py:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 +#: rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 -msgid "all" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 +#: rhodecode/model/db.py:1099 +msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 @@ -3220,8 +3300,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 +#: rhodecode/model/db.py:1100 +msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 @@ -3230,8 +3312,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 +#: rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 @@ -3240,36 +3324,54 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 +#: rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 +#: rhodecode/model/db.py:1103 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 -#: rhodecode/model/db.py:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 +#: rhodecode/model/db.py:2356 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 -#: rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 +#: rhodecode/model/db.py:2628 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/model/db.py:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 +#: rhodecode/model/db.py:2629 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/model/db.py:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 +#: rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3305,112 +3407,128 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:374 -msgid "made a comment" +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" msgstr "" #: rhodecode/model/comment.py:375 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 -msgid "None" -msgstr "" - #: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 #: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 -msgid "Read" +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 +msgid "None" msgstr "" #: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 #: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 +msgid "Read" +msgstr "" + +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3418,8 +3536,8 @@ msgstr "" msgid "Write" msgstr "" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3433,7 +3551,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3448,189 +3566,189 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "" -#: rhodecode/model/permission.py:86 -msgid "Allowed with manual account activation" -msgstr "" - #: rhodecode/model/permission.py:87 +msgid "Allowed with manual account activation" +msgstr "" + +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "" -#: rhodecode/model/permission.py:90 -msgid "Allow password recovery" -msgstr "" - #: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" +msgid "Allow password recovery" msgstr "" #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:119 +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:121 +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:123 +#: rhodecode/model/pull_request.py:122 msgid "" "Pull request cannot be updated because the reference type is not supported " "for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:126 +#: rhodecode/model/pull_request.py:125 msgid "" "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:129 +#: rhodecode/model/pull_request.py:128 msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "" - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 -msgid "Server-side pull request merging is disabled." -msgstr "" - -#: rhodecode/model/pull_request.py:1154 -msgid "This pull request is closed." -msgstr "" - #: rhodecode/model/pull_request.py:1166 +msgid "Server-side pull request merging is disabled." +msgstr "" + +#: rhodecode/model/pull_request.py:1168 +msgid "This pull request is closed." +msgstr "" + +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "La aprobacion del revisador de la solicitud de extracción está pendiente" -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "" @@ -3638,32 +3756,32 @@ msgstr "" msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "" -#: rhodecode/model/user.py:519 +#: rhodecode/model/user.py:523 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "" -#: rhodecode/model/user.py:528 +#: rhodecode/model/user.py:532 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3715,7 +3833,7 @@ msgstr "" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" +msgid "User group `%(usergroup)s` already exists" msgstr "" #: rhodecode/model/validators.py:226 @@ -3962,27 +4080,27 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "" "You do not have the permission to store repository groups in the root " "location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4022,440 +4140,454 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" @@ -4468,7 +4600,7 @@ msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" @@ -4476,141 +4608,159 @@ msgstr "" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this " +"page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No branches available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No gists available yet." +msgid "No bookmarks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" +msgid "No user groups available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Updating..." +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "" +"There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" msgstr "" @@ -4646,13 +4796,14 @@ msgstr "" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "" @@ -4684,19 +4835,19 @@ msgid "Edit Repository Group" msgstr "" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4706,12 +4857,15 @@ msgid "Name" msgstr "" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4719,13 +4873,15 @@ msgstr "" #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4733,48 +4889,51 @@ msgstr "" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4791,7 +4950,7 @@ msgid "Home" msgstr "" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "" @@ -4905,6 +5064,70 @@ msgstr "" msgid "Create Account" msgstr "" +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "" + #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 msgid "Admin audit logs" @@ -4915,68 +5138,34 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:68 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" msgstr "" @@ -5014,13 +5203,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -5048,21 +5237,21 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 -#: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -5117,7 +5306,7 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "" @@ -5128,15 +5317,15 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:122 +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " @@ -5169,7 +5358,7 @@ msgid "All Public Gists" msgstr "" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" msgstr "" @@ -5194,14 +5383,14 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5210,6 +5399,7 @@ msgid "Author" msgstr "" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5218,7 +5408,7 @@ msgid "Created on" msgstr "" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "" @@ -5252,44 +5442,33 @@ msgstr "" msgid "Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:56 -#: rhodecode/templates/admin/integrations/list.mako:204 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:60 -#: rhodecode/templates/data_table/_dt_elements.mako:118 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#: rhodecode/templates/data_table/_dt_elements.mako:193 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "" @@ -5302,7 +5481,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "" @@ -5315,7 +5494,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 #: rhodecode/templates/base/base.mako:84 -#: rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "" @@ -5337,67 +5516,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:115 -msgid "No {type} integrations for repo {repo} exist yet." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:117 -msgid "No {type} integrations for repogroup {repogroup} exist yet." -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:119 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:121 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5413,12 +5592,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "" @@ -5437,26 +5616,35 @@ msgstr "" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:39 -msgid "Watched" -msgstr "" - #: rhodecode/templates/admin/my_account/my_account.mako:40 -#: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:241 -msgid "Pull Requests" +msgid "Watched" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 +msgid "Pull Requests" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5465,7 +5653,7 @@ msgstr "" msgid "Permissions" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5515,16 +5703,23 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5616,11 +5811,11 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5629,7 +5824,7 @@ msgstr "" msgid "Title" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5638,39 +5833,95 @@ msgstr "" msgid "Repositories You Own" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "" +"SSH Keys usage is currently disabled, please ask your administrator to " +"enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "" +"Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-" +"sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 -msgid "Comments" -msgstr "" - -#: rhodecode/templates/admin/notifications/notifications.mako:37 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 msgid "Mark all as read" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "" - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 +msgid "Comments" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:5 @@ -5690,6 +5941,10 @@ msgid "IP Whitelist" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "" @@ -5730,32 +5985,45 @@ msgstr "" msgid "External Authentication Account Activation" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5810,6 +6078,14 @@ msgstr "" msgid "Default User Permissions Overview" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "" @@ -5826,16 +6102,21 @@ msgstr "" msgid "Group Name" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "" @@ -5851,7 +6132,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "" @@ -5880,20 +6161,6 @@ msgstr "" msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" @@ -5903,64 +6170,64 @@ msgstr "" msgid "Delete this repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." @@ -5971,19 +6238,23 @@ msgstr "" msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " @@ -5998,7 +6269,7 @@ msgstr "" msgid "repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "" @@ -6015,51 +6286,51 @@ msgstr "" msgid "Clone from" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "" +"Plain text format with support of {metatags}. Add a README file for longer " +"descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:79 -msgid "Set the type of repository to create." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" +msgid "{} Creating repository" msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 @@ -6091,7 +6362,7 @@ msgid "Remote" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "" @@ -6200,7 +6471,7 @@ msgid "Delete forks" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" @@ -6225,6 +6496,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6263,7 +6543,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 @@ -6451,8 +6731,8 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "" @@ -6470,9 +6750,9 @@ msgid "Remote uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "" @@ -6507,32 +6787,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -6627,7 +6907,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "" @@ -6727,7 +7007,7 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6912,6 +7192,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6969,10 +7258,6 @@ msgid "" "custom size" msgstr "" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7041,97 +7326,97 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:66 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +"Parses meta tags from repository or repository group description fields and " +"turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "" "Number of items displayed in the main page dashboard before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:117 +#: rhodecode/templates/admin/settings/settings_visual.mako:106 msgid "Commit ID Style" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:121 +#: rhodecode/templates/admin/settings/settings_visual.mako:110 msgid "Commit sha length" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:128 +#: rhodecode/templates/admin/settings/settings_visual.mako:117 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "" "Default renderer used to render comments, pull request descriptions and " "other description elements. After change old entries will still work " "correctly." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -7141,11 +7426,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7186,17 +7471,17 @@ msgid "%s user group settings" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "" @@ -7213,54 +7498,59 @@ msgstr "" msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 -msgid "This group is set to be automatically synchronised." -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 +msgid "This group is set to be automatically synchronised." +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "" "Users will be added or removed from this group when they authenticate with " "RhodeCode system, based on LDAP group membership. This requires `LDAP+User " "group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, python-format msgid "" "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "" @@ -7294,7 +7584,7 @@ msgstr "" msgid "user groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7334,7 +7624,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7365,16 +7655,12 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "User Groups Management" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" +msgid "User Groups Management" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 @@ -7388,107 +7674,91 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "" "When this is enabled user will have to change they password when they next " "use RhodeCode system. This will also forbid vcs operations until someone " "makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 msgid "Users personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "" "When selecting the detach option, the depending objects owned by this user " @@ -7500,10 +7770,6 @@ msgstr "" msgid "User Audit Logs" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 -msgid "audit filter..." -msgstr "" - #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" @@ -7522,10 +7788,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7582,6 +7844,29 @@ msgstr "" msgid "Help translate %(rc_link)s into your language." msgstr "" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "" +"Below is a 2048 bit generated SSH RSA key. You can use it to access " +"RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" msgstr "" @@ -7623,141 +7908,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: rhodecode/templates/base/base.mako:228 -#: rhodecode/templates/data_table/_dt_elements.mako:12 -#: rhodecode/templates/data_table/_dt_elements.mako:13 -#: rhodecode/templates/data_table/_dt_elements.mako:153 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "" -#: rhodecode/templates/base/base.mako:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 -msgid "Public journal" -msgstr "" - #: rhodecode/templates/base/base.mako:400 -msgid "Show Gists" -msgstr "" - -#: rhodecode/templates/base/base.mako:401 -msgid "Gists" +msgid "Public journal" msgstr "" #: rhodecode/templates/base/base.mako:405 +msgid "Show Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:406 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7779,15 +8064,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "" @@ -7897,9 +8182,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "" @@ -7907,77 +8192,94 @@ msgstr "" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:85 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 +msgid "Repository default permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:120 +msgid "Repository group default permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:123 +msgid "User group default permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:126 msgid "Super admin" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:87 -msgid "Repository default permission" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:88 -msgid "Repository group default permission" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:89 -msgid "User group default permission" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8100,93 +8402,74 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "" -"These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "" -"Use rebase instead of creating a merge commit when merging via web " -"interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "Solicitudes por proxy HTTP subversion" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "" "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "URL de Servidor HTTP Subversion" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -8194,16 +8477,40 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." msgstr "" +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "" +"Use rebase instead of creating a merge commit when merging via web " +"interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "" +"Close branch before merging it into destination branch. No effect when " +"rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -8218,8 +8525,8 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -8240,8 +8547,8 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -8253,55 +8560,54 @@ msgstr "" msgid "%s Changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "" @@ -8319,8 +8625,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8333,43 +8638,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8377,7 +8687,7 @@ msgstr "" msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8390,102 +8700,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 +#: rhodecode/templates/changeset/changeset.mako:142 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:140 -msgid "Raw Diff" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:143 +msgid "Raw Diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:144 -msgid "Patch Diff" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:147 +msgid "Patch Diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8555,12 +8847,12 @@ msgid "Leave a comment on this Commit." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "" @@ -8580,7 +8872,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" @@ -8598,15 +8890,8 @@ msgstr "" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8618,31 +8903,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8650,8 +8917,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -8659,8 +8926,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" msgstr "" @@ -8673,68 +8940,50 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "" -"%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "%(num)s archivo cambiado: %(linesadd)s insertados, %(linesdel)s eliminados" -msgstr[1] "%(num)s archivos cambiados: %(linesadd)s insertados, %(linesdel)s eliminados" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:118 +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "" +"This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "" -"This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:415 #: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format @@ -8793,7 +9042,7 @@ msgstr "" msgid "Wide Mode Diff" msgstr "" -#: rhodecode/templates/codeblocks/source.mako:24 +#: rhodecode/templates/codeblocks/source.mako:25 msgid "view annotation from before this change" msgstr "" @@ -8806,25 +9055,11 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" msgstr "" @@ -8834,13 +9069,6 @@ msgstr "" msgid "%s Compare" msgstr "" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 @@ -8854,14 +9082,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "" @@ -8885,72 +9113,69 @@ msgstr "" msgid "Compare commits, branches, bookmarks or tags." msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:49 +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, 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] "" - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" @@ -9252,13 +9477,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -9274,13 +9492,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9316,13 +9527,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9390,22 +9594,22 @@ msgid "Create New File" msgstr "" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "" @@ -9460,14 +9664,14 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " msgstr "" #: rhodecode/templates/files/files_delete.mako:70 @@ -9517,15 +9721,15 @@ msgstr "" msgid "annotation" msgstr "" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" msgstr "" -#: rhodecode/templates/files/files_edit.mako:74 +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "" @@ -9533,62 +9737,55 @@ msgstr "" msgid "Location" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 -msgid "Annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 -msgid "Raw" -msgstr "" - #: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 +msgid "Annotation" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 +msgid "Raw" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9602,22 +9799,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "" -#: rhodecode/templates/forks/fork.mako:97 -msgid "Copy permissions from forked repository" -msgstr "" - #: rhodecode/templates/forks/fork.mako:102 +msgid "Copy permissions from forked repository" +msgstr "" + +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "" @@ -9630,34 +9828,23 @@ msgstr "" msgid "Forks" msgstr "" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "" - -#: rhodecode/templates/journal/journal.mako:13 -msgid "Filter" -msgstr "" - #: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/journal/journal.mako:23 -msgid "ATOM journal feed" +msgid "Filter" msgstr "" #: rhodecode/templates/journal/journal.mako:24 +msgid "ATOM journal feed" +msgstr "" + +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "" @@ -9666,15 +9853,15 @@ msgid "No entries yet" msgstr "" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "" @@ -9704,22 +9891,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9732,13 +9919,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9763,26 +9943,26 @@ msgstr "" msgid "Merge is not currently possible because of below failed checks." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9803,171 +9983,175 @@ msgstr "" msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 -#, python-format -msgid "calculated based on %s reviewer vote" -msgid_plural "calculated based on %s reviewers votes" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 -msgid "{} version available for this pull request, show it." -msgid_plural "{} versions available for this pull request, show them." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 -#, python-format -msgid "%d General " -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 +msgid "Mandatory reviewer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "" "These commits cannot be displayed, because this repository uses the " "Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 msgid "" "This pull request cannot be displayed, because one or more commits no longer" " exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 msgid "" "Please update this pull request, push the commits back into the source " "repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 msgid "" "Commits and changes between v{ver_from} and {ver_to} of this pull request, " "commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -10070,7 +10254,7 @@ msgstr "" msgid "Age (old first)" msgstr "" -#: rhodecode/templates/search/search_content.mako:33 +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "" @@ -10078,84 +10262,74 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 -msgid "Show by Name" -msgstr "" - -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 -msgid "Show by ID" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -msgid "SVN Protocol is disabled. To enable it, see the" -msgstr "" - #: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 +msgid "Show by Name" +msgstr "" + +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 +msgid "Show by ID" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 +msgid "SVN Protocol is disabled. To enable it, see the" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "Las estadísticas para este repositorio están deshabilitadas" -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" msgstr "" @@ -10173,6 +10347,21 @@ msgstr "" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" msgstr "" diff --git a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: +# Arnaud GUT , 2017 # FIRST AUTHOR , 2011 msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-27 17:25+0200\n" -"PO-Revision-Date: 2017-06-27 15:26+0000\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" +"PO-Revision-Date: 2017-11-03 15:43+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: French (http://www.transifex.com/rhodecode/RhodeCode/language/fr/)\n" "MIME-Version: 1.0\n" @@ -20,10 +21,10 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" -msgstr "" +msgstr "Global" #: rhodecode/apps/admin/navigation.py:84 #: rhodecode/templates/admin/repos/repo_edit.mako:55 @@ -41,7 +42,7 @@ msgstr "" #: rhodecode/apps/admin/navigation.py:87 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" -msgstr "" +msgstr "Gestionnaire de défaut" #: rhodecode/apps/admin/navigation.py:89 #: rhodecode/integrations/types/email.py:232 @@ -54,7 +55,7 @@ msgstr "" #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" -msgstr "E-mail" +msgstr "Courriel" #: rhodecode/apps/admin/navigation.py:90 msgid "Hooks" @@ -80,74 +81,143 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:75 #: rhodecode/templates/base/base.mako:82 msgid "Integrations" -msgstr "" +msgstr "Intégrations" #: rhodecode/apps/admin/navigation.py:95 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" -msgstr "" +msgstr "Information système" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" +msgid "Processes" msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "Session utilisateur" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" -msgstr "" - -#: rhodecode/apps/admin/navigation.py:107 +msgstr "Licences Logiciel Libre" + +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "Mise à jour des paramètres par défaut réussie" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "Une erreur est survenue pendant la mise à jour des valeurs par défaut" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "Mise à jour des permissions de l'application réussie" + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "Une erreur est suvenue lors de la mise à jour des permissions" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "Mise à jour des permission globales réussie" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:198 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" -msgstr "" +msgstr "Anciennes sessions nettoyées" #: rhodecode/apps/admin/views/sessions.py:98 msgid "Failed to cleanup up old sessions" -msgstr "" +msgstr "Les anciennes sessions n'ont pas pu être nettoyées" #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." -msgstr "" +msgstr "La configuration Apache pour Subversion a été générée." #: rhodecode/apps/admin/views/svn_config.py:54 msgid "Failed to generate the Apache configuration for Subversion." -msgstr "" +msgstr "La configuration Apache pour Subversion n'a pas pu être générée." #: rhodecode/apps/admin/views/system_info.py:99 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" -msgstr "" +msgstr "Note: vérifiez que ce server peut accéder `${url}` pour que le lien de mise à jour fonctionne" #: rhodecode/apps/admin/views/system_info.py:102 msgid "Update info" -msgstr "" +msgstr "Information de mise à jour" #: rhodecode/apps/admin/views/system_info.py:104 msgid "Check for updates" -msgstr "" +msgstr "Vérifier les mises à jour" #: rhodecode/apps/admin/views/system_info.py:109 msgid "RhodeCode Version" -msgstr "" +msgstr "Version de RhodeCode" #: rhodecode/apps/admin/views/system_info.py:110 msgid "RhodeCode Server IP" -msgstr "" +msgstr "IP du serveur RhodeCode" #: rhodecode/apps/admin/views/system_info.py:111 msgid "RhodeCode Server ID" -msgstr "" +msgstr "ID du serveur RhodeCode" #: rhodecode/apps/admin/views/system_info.py:112 msgid "RhodeCode Configuration" -msgstr "" +msgstr "Configuration de RhodeCode" #: rhodecode/apps/admin/views/system_info.py:113 msgid "RhodeCode Certificate" -msgstr "" +msgstr "Certificat de RhodeCode" #: rhodecode/apps/admin/views/system_info.py:114 msgid "Workers" @@ -159,51 +229,51 @@ msgstr "" #: rhodecode/apps/admin/views/system_info.py:119 msgid "Database" -msgstr "" +msgstr "Base de données" #: rhodecode/apps/admin/views/system_info.py:120 msgid "Database version" -msgstr "" +msgstr "Version de la base de données" #: rhodecode/apps/admin/views/system_info.py:124 msgid "Platform" -msgstr "" +msgstr "Plate-forme" #: rhodecode/apps/admin/views/system_info.py:125 msgid "Platform UUID" -msgstr "" +msgstr "UUID de la plate-forme" #: rhodecode/apps/admin/views/system_info.py:126 msgid "Python version" -msgstr "" +msgstr "Version de Python" #: rhodecode/apps/admin/views/system_info.py:127 msgid "Python path" -msgstr "" +msgstr "Chemin d'accès de Python" #: rhodecode/apps/admin/views/system_info.py:131 msgid "CPU" -msgstr "" +msgstr "UC" #: rhodecode/apps/admin/views/system_info.py:132 msgid "Load" -msgstr "" +msgstr "Charge" #: rhodecode/apps/admin/views/system_info.py:133 msgid "Memory" -msgstr "" +msgstr "Mémoire" #: rhodecode/apps/admin/views/system_info.py:134 msgid "Uptime" -msgstr "" +msgstr "Temps de fonctionnement" #: rhodecode/apps/admin/views/system_info.py:138 msgid "Storage location" -msgstr "" +msgstr "Lieu de stockage" #: rhodecode/apps/admin/views/system_info.py:139 msgid "Storage info" -msgstr "" +msgstr "Information de stockage" #: rhodecode/apps/admin/views/system_info.py:140 msgid "Storage inodes" @@ -211,15 +281,15 @@ msgstr "" #: rhodecode/apps/admin/views/system_info.py:142 msgid "Gist storage location" -msgstr "" +msgstr "Lieu de stockage Gist" #: rhodecode/apps/admin/views/system_info.py:143 msgid "Gist storage info" -msgstr "" +msgstr "Information de stockage Gist" #: rhodecode/apps/admin/views/system_info.py:145 msgid "Archive cache storage location" -msgstr "" +msgstr "Lieu de stockage du cache de l'archive" #: rhodecode/apps/admin/views/system_info.py:146 msgid "Archive cache info" @@ -227,15 +297,15 @@ msgstr "" #: rhodecode/apps/admin/views/system_info.py:148 msgid "Temp storage location" -msgstr "" +msgstr "Lieu de stockage temporaire" #: rhodecode/apps/admin/views/system_info.py:149 msgid "Temp storage info" -msgstr "" +msgstr "Information de stockage temporaire" #: rhodecode/apps/admin/views/system_info.py:151 msgid "Search info" -msgstr "" +msgstr "Information de recherche" #: rhodecode/apps/admin/views/system_info.py:152 msgid "Search location" @@ -251,327 +321,913 @@ msgstr "" #: rhodecode/apps/admin/views/system_info.py:158 msgid "GIT" -msgstr "" +msgstr "GIT" #: rhodecode/apps/admin/views/system_info.py:159 msgid "HG" -msgstr "" +msgstr "HG" #: rhodecode/apps/admin/views/system_info.py:160 msgid "SVN" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "Vous ne pouvez pas éditer cet utilisateur" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "5 minute" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "1 heure" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "1 jour" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "1 mois" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +msgstr "SVN" + +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "Mise à jour de l'utilisateur réussie." + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "Une erreur est survenue durant la suppression de l’utilisateur." + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "Une erreur est survenue durant l’enregistrement des permissions." + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "Une erreur est survenue lors de la réinitialisation du mot de passe de l'utilisateur" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "Une erreur est survenue lors de la création d'un groupe de dépôt pour l'utilisateur" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:217 -#: rhodecode/apps/my_account/views.py:191 +msgstr "Rôle" + +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +msgstr "Jeton d'authentification créé avec succès" + +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +msgstr "Jeton d'authentification supprimé avec succès" + +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail." -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:372 +msgstr "Adresse de courriel supprimée du compte de l'utilisateur" + +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:393 +msgstr "Une erreur est survenue lors de la sauvegarde de l'IP" + +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:472 +msgstr "Adresses IP supprimées de la liste blanche de l'utilisateur" + +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" -msgstr "" - -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +msgstr "Groupes modifiés avec succès" + +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "Pour toujours" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "5 minutes" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "1 heure" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "1 jour" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "1 mois" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "Durée de vie" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "Un compte déclaré es requis" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "Ne peut pas être accédé par des utilisateurs anonymes" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "Une erreur est survenue lors de la creation du gist" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/data_table/_dt_elements.mako:323 +msgid "never" +msgstr "jamais" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "Mise à jour du contenu du gist réussie" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "Mise à jour des données du gist réussie" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "Une erreur est survenue lors de la mise du gist {}: {}" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 #: rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "Dépôts" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "Groupes" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "Journal public" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "Journal" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" -msgstr "" - -#: rhodecode/apps/login/views.py:279 +msgstr "Mauvais captcha" + +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" -msgstr "" - -#: rhodecode/apps/login/views.py:315 +msgstr "Vous vous êtes enregistré sur RhodeCode avec succès" + +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." -msgstr "" - -#: rhodecode/apps/login/views.py:321 +msgstr "Si un tel courriel existe, un lien de réinitialisation du mot de passe a été envoyé à ce courriel." + +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." -msgstr "" - -#: rhodecode/apps/login/views.py:410 +msgstr "La réinitialisation du mot de passe est désactivée." + +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "" "Your password reset was successful, a new password has been sent to your " "email" -msgstr "" - -#: rhodecode/apps/my_account/views.py:125 +msgstr "La réinitialisation de votre mot de passe a réussi, un nouveau mot de passe a été envoyé par courriel." + +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" -msgstr "" - -#: rhodecode/apps/my_account/views.py:132 +msgstr "Une erreur est survenue pendant la mise à jour du mot de passe de l'utilisateur" + +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" -msgstr "" - -#: rhodecode/apps/my_account/views.py:281 +msgstr "Mot de passe modifié avec succès" + +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" -msgstr "" - -#: rhodecode/apps/repository/views/repo_caches.py:70 +msgstr "Courriel supprimé avec succès" + +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "Votre compte a été mis à jour avec succès" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "Permissions du groupe de dépôts mises à jour" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" -msgstr "" - -#: rhodecode/apps/repository/views/repo_caches.py:74 +msgstr "Invalidation du cache réussie" + +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "Il n'y a pas encore de révisions" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "Ce commit n'existe pas dans ce dépôt" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "dépôt %s forké en tant que %s" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "Montre les espaces" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "Montrer les espaces pour tous les diffs" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "Ignorer les espaces" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "Ignorer les espaces pour tous les diffs" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "Elargir le contexte" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "Elargir le contexte pour tous les diffs" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "" +"Changing the status of a commit associated with a closed pull request is not" +" allowed" +msgstr "Modifier le statut d'une révision associée à un pull request clos n'est pas autorisé" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "Selectionner une révision" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "Dépôt source non trouvé : `{}`" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "Dépôt cible non trouvé : `{}`" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "La comparaison de différentes sortes de dépôts distants n'est pas disponible" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "Ne peut pas comparer des dépôts avec des paramètres de gros fichiers différents" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "" +"Repositories unrelated. Cannot compare commit %(commit1)s from repository " +"%(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "Changements sur le dépôt %s" + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "Flux %s de %s" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "Cliquez ici pour ajouter un nouveau fichier" + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "Les téléchargements sont désactivés" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "Dépôt vide." + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "Type d’archive inconnu" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "Changesets" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "Branches" + +#: rhodecode/apps/repository/views/repo_files.py:890 +#: rhodecode/model/scm.py:791 rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "Tags" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "Supprimer un fichier {} via RhodeCode Enterprise" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "Fichier `{}` supprimé avec succès." + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "Une erreur est survenue durant le commit" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "Editer le fichier {} via RhodeCode Enterprise" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "Aucun changement" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "Révisions acceptées sur le fichier `{}`" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "Fichier ajouté via RhodeCode Enterprise" + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "Aucun nom de fichier" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "" +"The location specified must be a relative path and must not contain .. in " +"the path" +msgstr "L'emplacement spécifié doit être un chemin relatif et ne doit pas contenir .. dans le chemin" + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "Comparer le fork" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Une erreur est survenue durant le fork du dépôt %s." + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" +msgstr "Les permissions du dépôt ont été mises à jour" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "La révision n'existe pas" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +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." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "Erreur à la création du pull request: {}" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "La requête de pull a été ouverte avec succès." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "Une erreur est survenue lors de la création de ce pull request" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "Imposible de mettre à jour des pull requests clos." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "Titre et desccription du pull request mis à jour." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "" +"Pull request updated to \"{source_commit_id}\" with {count_added} added, " +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "Recharger la page" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "La requête de pull a été supprimée avec succès." + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" msgstr "" #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +msgstr "Une erreur est survenue lors de la mise à jour du dépôt {}" + +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "Débloqué" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "Bloqué" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "Le dépôt a été %s." + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "Une erreur est survenue durant le déverrouillage." + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt." + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "" "Cannot delete `{repo}` it still contains attached forks. Try using " "{delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour." -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 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." -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "[Aucun dépôt]" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +msgstr "Dépôt bloqué" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "Une erreur est survenue durant le déverrouillage." - -#: rhodecode/apps/repository/views/repo_summary.py:293 +msgstr "Dépôt débloqué" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "Une erreur est survenue lors de la création du champ" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "Une erreur est survenue lors de la suppression du champ" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "Les changements distants ont été récupérés." + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "Une erreur est survenue durant le pull depuis la source distante." + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "Réglages des gestionnaires de versions mis à jour." + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" -msgstr "" - -#: rhodecode/apps/repository/views/repo_summary.py:294 +msgstr "Branche" + +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" -msgstr "" - -#: rhodecode/apps/repository/views/repo_summary.py:295 +msgstr "Label" + +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" -msgstr "" - -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "Branches" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +msgstr "Marque page" + +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" +msgstr "Branches fermées" + +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." msgstr "" #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "Suppression du groupe d'utilisateur réussie" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "Une erreur est survenue lors de la suppression du groupe d'utilisateurs" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "Le groupe cible ne peut pas être le même" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "Permissions du groupe d'utilisateurs mis à jour" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "Mise à jour des permissions globales des groupes d'utilisateurs réussie" + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" msgstr "" #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." -msgstr "" +msgstr "Activer ou désactiver ce plugin d'authentification" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" -msgstr "Autorisée" +msgstr "Activé" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication responsecall for this plugin. \n" -"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:49 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" -msgstr "" +msgstr "Durée de vie du cache d'authentification" #: rhodecode/authentication/views.py:90 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." -msgstr "" - -#: rhodecode/authentication/views.py:177 +msgstr "Paramètres d'authentification mis à jour avec succès." + +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." -msgstr "" - -#: rhodecode/authentication/views.py:187 +msgstr "Il y a des erreurs à la sauvegarde des paramètres du plugin. Vérifiez vos entrées." + +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." -msgstr "" +msgstr "Une erreur s'est produite pendant la mise à jour des paramètres d'authentification." #: rhodecode/authentication/plugins/auth_crowd.py:60 msgid "The FQDN or IP of the Atlassian CROWD Server" -msgstr "" +msgstr "Le FDQN ou l'IP du server CROWD d'Atlassian" #: rhodecode/authentication/plugins/auth_crowd.py:62 msgid "Host" @@ -579,7 +1235,7 @@ msgstr "Serveur" #: rhodecode/authentication/plugins/auth_crowd.py:67 msgid "The Port in use by the Atlassian CROWD Server" -msgstr "" +msgstr "Le port utilisé par le server CROWD d'Atlassian" #: rhodecode/authentication/plugins/auth_crowd.py:69 #: rhodecode/authentication/plugins/auth_ldap.py:86 @@ -588,99 +1244,98 @@ msgstr "Port" #: rhodecode/authentication/plugins/auth_crowd.py:75 msgid "The Application Name to authenticate to CROWD" -msgstr "" +msgstr "Nom de l'application pour s'authentifier sur CROWD" #: rhodecode/authentication/plugins/auth_crowd.py:77 msgid "Application Name" -msgstr "" +msgstr "Nom de l'application" #: rhodecode/authentication/plugins/auth_crowd.py:82 msgid "The password to authenticate to CROWD" -msgstr "" +msgstr "Mot de passe pour s'authentifier sur CROWD" #: rhodecode/authentication/plugins/auth_crowd.py:84 msgid "Application Password" -msgstr "" +msgstr "Mot de passe de l'application" #: rhodecode/authentication/plugins/auth_crowd.py:89 msgid "" "A comma separated list of group names that identify users as RhodeCode " "Administrators" -msgstr "" +msgstr "Liste de groupes d'utilisateurs séparés par des virgules qui identifient les utilsateurs comme des administrateurs de RhodeCode" #: rhodecode/authentication/plugins/auth_crowd.py:93 msgid "Admin Groups" -msgstr "" +msgstr "Groupes d'administrateurs" #: rhodecode/authentication/plugins/auth_crowd.py:216 msgid "CROWD" -msgstr "" +msgstr "CROWD" #: rhodecode/authentication/plugins/auth_headers.py:54 msgid "Header to extract the user from" -msgstr "" +msgstr "En-tête pour extraire les utilisateurs de " #: rhodecode/authentication/plugins/auth_headers.py:56 msgid "Header" -msgstr "" +msgstr "En-tête" #: rhodecode/authentication/plugins/auth_headers.py:61 msgid "Header to extract the user from when main one fails" -msgstr "" +msgstr "En-tête pour extraire l'utilisateur quand le principal ne fonctionne pas" #: rhodecode/authentication/plugins/auth_headers.py:63 msgid "Fallback header" -msgstr "" +msgstr "En-tête de rechange" #: rhodecode/authentication/plugins/auth_headers.py:68 msgid "" "Perform cleaning of user, if passed user has @ in username then first part " "before @ is taken. If there's \\ in the username only the part after \\ is " "taken" -msgstr "" +msgstr "Accomplir le nettoyage du compte utilisateur, si OK l'utilisateur a un @ dans son nom alors seulement la partie avant l'@ est prise en compte. Si le nom de l'utilisateur contient un \\ , seulement la partie après le \\ est prise en compte" #: rhodecode/authentication/plugins/auth_headers.py:73 msgid "Clean username" -msgstr "" +msgstr "Nettoyer le nom de d'l'utilisateur" #: rhodecode/authentication/plugins/auth_headers.py:98 msgid "Headers" -msgstr "" +msgstr "En-têtes" #: rhodecode/authentication/plugins/auth_jasig_cas.py:62 msgid "The url of the Jasig CAS REST service" -msgstr "" +msgstr "L'URL du service Jasig CAS REST " #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" -msgstr "" +msgstr "URL" #: rhodecode/authentication/plugins/auth_jasig_cas.py:92 msgid "Jasig-CAS" -msgstr "" +msgstr "Jasig-CAS" #: rhodecode/authentication/plugins/auth_ldap.py:74 msgid "" "Host[s] of the LDAP Server \n" "(e.g., 192.168.2.154, or ldap-server.domain.com.\n" " Multiple servers can be specified using commas" -msgstr "" +msgstr "Serveur LDAP\n(i.e., 192.168.2.154, ou ldap-serveur.domaine.com).\n Plusieurs serveurs peuvent être spécifiés en les séparant par des virgules." #: rhodecode/authentication/plugins/auth_ldap.py:78 msgid "LDAP Host" -msgstr "" +msgstr "Serveur LDAP" #: rhodecode/authentication/plugins/auth_ldap.py:83 msgid "" "Custom port that the LDAP server is listening on. Default value is: 389" -msgstr "" +msgstr "Port sur lequel écoute le serveur LDAP. Par défaut le 389." #: rhodecode/authentication/plugins/auth_ldap.py:92 msgid "" "Optional user DN/account to connect to LDAP if authentication is required. \n" "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or admin@mydomain.com" -msgstr "" +msgstr "Compte utilisateur optionnel (DN/account) pour se connecter au LDAP si une authentification est requise. \ni.e., cn=admin,dc=mondomaine,dc=com, ou uid=root,cn=users,dc=mondomaine,dc=com, ou admin@mondomaine.com" #: rhodecode/authentication/plugins/auth_ldap.py:97 msgid "Account" @@ -688,30 +1343,31 @@ msgstr "Compte" #: rhodecode/authentication/plugins/auth_ldap.py:102 msgid "Password to authenticate for given user DN." -msgstr "" +msgstr "Mot de passe pour authentifier l'utilisateur DN" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Mot de passe" #: rhodecode/authentication/plugins/auth_ldap.py:110 msgid "TLS Type" -msgstr "" +msgstr "Type de TLS" #: rhodecode/authentication/plugins/auth_ldap.py:111 msgid "Connection Security" -msgstr "" +msgstr "Sécurité de la connection" #: rhodecode/authentication/plugins/auth_ldap.py:117 msgid "" "Require Cert over TLS?. Self-signed and custom certificates can be used when\n" " `RhodeCode Certificate` found in admin > settings > system info page is extended." -msgstr "" +msgstr "Cert au dessus de TLS requis ?. Des certificats auto-signés et sur mesure peuvent être utilisés quand\nla page `RhodeCode Certificate` trouvée dans admin > settings > system est étendue." #: rhodecode/authentication/plugins/auth_ldap.py:120 msgid "Certificate Checks" @@ -721,7 +1377,7 @@ msgstr "Vérif. des certificats" msgid "" "Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n" "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)" -msgstr "" +msgstr "Base DN à rechercher. Le bind dynamique est supporté. Ajouter le marqueur `$login` dans celui-ci. Il sera remplacé par les identifiants de connexion de l'utilisateur\n(i.e., dc=mondomaine,dc=com, ou ou=Users,dc=mondomaine,dc=com)" #: rhodecode/authentication/plugins/auth_ldap.py:131 msgid "Base DN" @@ -732,23 +1388,23 @@ msgid "" "Filter to narrow results \n" "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n" "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))" -msgstr "" +msgstr "Filtrer sur des résultats voisins \n(i.e., (&(objectCategory=Person)(objectClass=user)), ou \n(memberof=cn=rc-login,ou=groups,ou=company,dc=mondomaine,dc=com)))" #: rhodecode/authentication/plugins/auth_ldap.py:141 msgid "LDAP Search Filter" -msgstr "" +msgstr "Filtre de recherche LDAP" #: rhodecode/authentication/plugins/auth_ldap.py:147 msgid "How deep to search LDAP. If unsure set to SUBTREE" -msgstr "" +msgstr "Profondeur de recherche dans le LDAP. Si non connue, préciser SUBTREE." #: rhodecode/authentication/plugins/auth_ldap.py:148 msgid "LDAP Search Scope" -msgstr "Portée de recherche" +msgstr "Portée de la recherche LDAP" #: rhodecode/authentication/plugins/auth_ldap.py:154 msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" -msgstr "" +msgstr "Attribut LDAP pour désigner le nom de l'utilisateur (i.e., uid, ou sAMAccountName)" #: rhodecode/authentication/plugins/auth_ldap.py:156 msgid "Login Attribute" @@ -756,11 +1412,11 @@ msgstr "Attribut pour le nom d’utilisateur" #: rhodecode/authentication/plugins/auth_ldap.py:157 msgid "The LDAP Login attribute of the CN must be specified" -msgstr "" +msgstr "L'attribut de login LDAP du CN doit être spécifié." #: rhodecode/authentication/plugins/auth_ldap.py:162 msgid "LDAP Attribute to map to first name (e.g., givenName)" -msgstr "" +msgstr "Attribut LDAP pour désigner le prénom (i.e., givenName)" #: rhodecode/authentication/plugins/auth_ldap.py:165 msgid "First Name Attribute" @@ -768,7 +1424,7 @@ msgstr "Attribut pour le prénom" #: rhodecode/authentication/plugins/auth_ldap.py:170 msgid "LDAP Attribute to map to last name (e.g., sn)" -msgstr "" +msgstr "Attribut LDAP pour désigner le nom (i.e., sn)" #: rhodecode/authentication/plugins/auth_ldap.py:173 msgid "Last Name Attribute" @@ -779,514 +1435,44 @@ msgid "" "LDAP Attribute to map to email address (e.g., mail).\n" "Emails are a crucial part of RhodeCode. \n" "If possible add a valid email attribute to ldap users." -msgstr "" +msgstr "Attribut LDAP pour désigner l'adresse de courriel (i.e., mail).\n Les adresses de courriel sont cruciales pour RhodeCode. \nSi possible donnez une adresse de courriel valide à l'attribut email des utilisateurs LDAP." #: rhodecode/authentication/plugins/auth_ldap.py:183 msgid "Email Attribute" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:365 +msgstr "Attribut de courriel" + +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" -msgstr "" +msgstr "LDAP" #: rhodecode/authentication/plugins/auth_pam.py:60 msgid "PAM service name to use for authentication." -msgstr "" +msgstr "Nom de service PAM à utiliser pour l'authentification" #: rhodecode/authentication/plugins/auth_pam.py:62 msgid "PAM service name" -msgstr "" +msgstr "Nom du service PAM " #: rhodecode/authentication/plugins/auth_pam.py:67 msgid "" "Regular expression for extracting user name/email etc. from Unix userinfo." -msgstr "" +msgstr "Expression régulière pour extraire le nom, le courriel, etc d'un utilisateur." #: rhodecode/authentication/plugins/auth_pam.py:70 msgid "Gecos Regex" -msgstr "" +msgstr "Expression régulière Gecos" #: rhodecode/authentication/plugins/auth_pam.py:98 msgid "PAM" -msgstr "" +msgstr "PAM" #: rhodecode/authentication/plugins/auth_rhodecode.py:67 msgid "Rhodecode" -msgstr "" +msgstr "RhodeCode" #: rhodecode/authentication/plugins/auth_token.py:70 msgid "Rhodecode Token Auth" -msgstr "" - -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "" - -#: rhodecode/controllers/changeset.py:343 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "" - -#: rhodecode/controllers/changeset.py:387 -msgid "" -"Changing the status of a commit associated with a closed pull request is not" -" allowed" -msgstr "" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "" -"Repositories unrelated. Cannot compare commit %(commit1)s from repository " -"%(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "Changements sur le dépôt %s" - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "Flux %s de %s" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "" - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "Une erreur est survenue durant le commit" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -msgid "You can only edit files with revision being a valid branch " -msgstr "" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "Aucun changement" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "Aucun nom de fichier" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "" -"The location specified must be a relative path and must not contain .. in " -"the path" -msgstr "" - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "Les téléchargements sont désactivés" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "Révision %s inconnue." - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "Dépôt vide." - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "Type d’archive inconnu" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "Changesets" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "Tags" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "Une erreur est survenue durant le fork du dépôt %s." - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "Journal public" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "Journal" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:216 -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." - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "La requête de pull a été ouverte avec succès." - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:346 -msgid "" -"Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "La requête de pull a été supprimée avec succès." - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -msgid "never" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "" - -#: rhodecode/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." - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "Votre compte a été mis à jour avec succès" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, python-format -msgid "Error occurred during deletion of repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "dépôt %s forké en tant que %s" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "Le dépôt a été %s." - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "Les changements distants ont été récupérés." - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "Une erreur est survenue durant le pull depuis la source distante." - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt." - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "" - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "Réglages des gestionnaires de versions mis à jour." +msgstr "Jeton d'authentification RhodeCode" #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 @@ -1308,11 +1494,11 @@ msgstr "Réglages d’affichage mis à jour." #: rhodecode/controllers/admin/settings.py:351 msgid "Error occurred during updating visualisation settings" -msgstr "" +msgstr "Une erreur est survenue lors de la mise à jour des paramètres de visualisation" #: rhodecode/controllers/admin/settings.py:444 msgid "Please enter email address" -msgstr "" +msgstr "Entrez votre adresse de courriel SVP" #: rhodecode/controllers/admin/settings.py:462 msgid "Send email task created" @@ -1328,7 +1514,7 @@ msgstr "Hooks mis à jour" #: rhodecode/controllers/admin/settings.py:514 msgid "Error occurred during hook creation" -msgstr "" +msgstr "Une erreur est survenue lors de la création du hook" #: rhodecode/controllers/admin/settings.py:643 msgid "Error occurred during updating labs settings" @@ -1338,205 +1524,59 @@ msgstr "" msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "Une erreur est survenue durant l’enregistrement des permissions." - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "L’utilisateur a été mis à jour avec succès." - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "Une erreur est survenue durant la suppression de l’utilisateur." - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:396 -msgid "" -"The user participates as reviewer in pull requests and cannot be deleted. " -"You can set the user to \"inactive\" instead of deleting it." -msgstr "" - -#: rhodecode/controllers/admin/users.py:462 -msgid "User global permissions updated successfully" -msgstr "" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" -msgstr "" - -#: rhodecode/events/repo.py:166 +msgstr "Dépôt créé" + +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" -msgstr "" - -#: rhodecode/events/repo.py:211 +msgstr "Dépôt supprimé" + +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "" @@ -1554,7 +1594,7 @@ msgstr "" #: rhodecode/events/user.py:37 msgid "user registered" -msgstr "" +msgstr "Utilisateur enregistré" #: rhodecode/events/user.py:52 msgid "user pre create" @@ -1572,54 +1612,60 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 -#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "Réinitialiser" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1628,17 +1674,17 @@ msgstr "Supprimer" #: rhodecode/integrations/schema.py:30 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195 msgid "Enable or disable this integration." -msgstr "" +msgstr "Activer ou désactiver cette intégration." #: rhodecode/integrations/schema.py:37 #: rhodecode/model/validation_schema/schemas/integration_schema.py:176 msgid "Short name for this integration." -msgstr "" +msgstr "Nom court pour cette intégration" #: rhodecode/integrations/schema.py:39 #: rhodecode/model/validation_schema/schemas/integration_schema.py:178 msgid "Integration name" -msgstr "" +msgstr "Nom de l'intégration" #: rhodecode/integrations/schema.py:51 msgid "" @@ -1658,28 +1704,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1763,17 +1809,19 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1809,132 +1857,158 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:166 -msgid "" -"URL of the webhook to receive POST event. Following variables are allowed to" -" be used: {vars}. Some of the variables would trigger multiple calls, like " +#: rhodecode/integrations/types/webhook.py:179 +msgid "" +"URL to which Webhook should submit data. Following variables are allowed to " +"be used: {vars}. Some of the variables would trigger multiple calls, like " "${{branch}} or ${{commit_id}}. Webhook will be called as many times as " "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "" +"Optional string used to validate received payloads. It will be sent together" +" with event data in JSON" msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" -msgstr "" - -#: rhodecode/lib/action_parser.py:148 +msgstr "[mergé] pull request pour" + +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "[a commité via RhodeCode] dans le dépôt" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1945,59 +2019,49 @@ msgstr "Requête de pull #%s" msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" -msgstr "" - -#: rhodecode/lib/auth.py:1220 +msgstr "Révision non trouvée" + +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 msgid "You need to be a registered user to perform this action" msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action." -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "" - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" -msgstr "" - -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "" +msgstr "Vous devez vous connecter pour voir cette page" #: rhodecode/lib/diffs.py:62 msgid "Click to comment" -msgstr "" +msgstr "Cliquer pour commenter" #: rhodecode/lib/diffs.py:77 msgid "Binary file" -msgstr "" +msgstr "Fichier binaire" #: rhodecode/lib/diffs.py:98 msgid "" @@ -2008,20 +2072,11 @@ 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." msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr "et %s de plus" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "Aucun fichier" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2041,7 +2096,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2055,54 +2110,54 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, 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." -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "à l’instant" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2119,24 +2174,25 @@ msgstr "à l’instant" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 +#: rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "Aucun accès au dépôt" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2153,24 +2209,25 @@ msgstr "Aucun accès au dépôt" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 +#: rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "Accès en lecture au dépôt" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2187,24 +2244,25 @@ msgstr "Accès en lecture au dépôt" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 +#: rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "Accès en écriture au dépôt" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2221,48 +2279,49 @@ msgstr "Accès en écriture au dépôt" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/model/db.py:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 +#: rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "Accès administrateur au dépôt" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "Aucun accès au groupe de dépôts" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "Accès en lecture au groupe de dépôts" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "Accès en écriture au groupe de dépôts" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "Accès administrateur au groupe de dépôts" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2278,7 +2337,7 @@ msgstr "Accès administrateur au groupe de dépôts" msgid "RhodeCode Administrator" msgstr "Administrateur RhodeCode" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2295,24 +2354,25 @@ msgstr "Administrateur RhodeCode" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 +#: rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "Création de dépôt désactivée" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2329,24 +2389,25 @@ msgstr "Création de dépôt désactivée" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/model/db.py:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 +#: rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "Création de dépôt activée" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2363,24 +2424,25 @@ msgstr "Création de dépôt activée" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 -#: rhodecode/model/db.py:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 +#: rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "Fork de dépôt désactivé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2397,45 +2459,46 @@ msgstr "Fork de dépôt désactivé" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 +#: rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "Fork de dépôt activé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "Enregistrement désactivé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2452,24 +2515,25 @@ msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 -#: rhodecode/model/db.py:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 +#: rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "Pas encore relue" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2486,24 +2550,25 @@ msgstr "Pas encore relue" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 -#: rhodecode/model/db.py:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 +#: rhodecode/model/db.py:3325 msgid "Approved" msgstr "Approuvée " -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2520,24 +2585,25 @@ msgstr "Approuvée " #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 -#: rhodecode/model/db.py:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 +#: rhodecode/model/db.py:3326 msgid "Rejected" msgstr "Rejetée" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2554,20 +2620,21 @@ msgstr "Rejetée" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 -#: rhodecode/model/db.py:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 +#: rhodecode/model/db.py:3327 msgid "Under Review" msgstr "En cours de relecture" @@ -2585,20 +2652,21 @@ msgstr "En cours de relecture" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 +#: rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "" @@ -2616,20 +2684,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 +#: rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "" @@ -2647,20 +2716,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 +#: rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "" @@ -2678,20 +2748,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/model/db.py:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 +#: rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "" @@ -2708,20 +2779,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 +#: rhodecode/model/db.py:2605 msgid "User group no access" msgstr "" @@ -2738,20 +2810,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/model/db.py:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 +#: rhodecode/model/db.py:2606 msgid "User group read access" msgstr "" @@ -2768,20 +2841,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 +#: rhodecode/model/db.py:2607 msgid "User group write access" msgstr "" @@ -2798,20 +2872,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 +#: rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "" @@ -2828,20 +2903,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 +#: rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "" @@ -2858,20 +2934,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 +#: rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "" @@ -2888,20 +2965,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 +#: rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "" @@ -2918,20 +2996,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 +#: rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "" @@ -2948,20 +3027,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/model/db.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 +#: rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "" @@ -2978,20 +3058,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 -#: rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 +#: rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "" @@ -3008,20 +3089,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 +#: rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "" @@ -3038,20 +3120,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 -#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 +#: rhodecode/model/db.py:2632 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "" @@ -3068,20 +3151,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 -#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 +#: rhodecode/model/db.py:2633 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "" @@ -3092,20 +3176,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 +#: rhodecode/model/db.py:2618 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3117,20 +3202,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 +#: rhodecode/model/db.py:2619 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3139,79 +3225,74 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 +#: rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 +#: rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 -#: rhodecode/model/db.py:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "" - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 -#: rhodecode/model/db.py:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 +#: rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 -msgid "all" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 +#: rhodecode/model/db.py:1099 +msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 @@ -3220,8 +3301,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 +#: rhodecode/model/db.py:1100 +msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 @@ -3230,8 +3313,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 +#: rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 @@ -3240,36 +3325,54 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 +#: rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 +#: rhodecode/model/db.py:1103 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 -#: rhodecode/model/db.py:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 +#: rhodecode/model/db.py:2356 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 -#: rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 +#: rhodecode/model/db.py:2628 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/model/db.py:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 +#: rhodecode/model/db.py:2629 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/model/db.py:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 +#: rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3305,112 +3408,128 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:374 -msgid "made a comment" +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" msgstr "" #: rhodecode/model/comment.py:375 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "Veuillez entrer un identifiant" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Entrez une valeur d’au moins %(min)i caractères de long." -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "Veuillez entrer un mot de passe" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entrez au moins %(min)i caractères" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 +#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 +#: rhodecode/model/permission.py:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "Aucun" -#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 -#: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 +#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 +#: rhodecode/model/permission.py:81 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "Lire" -#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 -#: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3418,8 +3537,8 @@ msgstr "Lire" msgid "Write" msgstr "Écrire" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3433,7 +3552,7 @@ msgstr "Écrire" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3448,189 +3567,189 @@ msgstr "Écrire" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "Administration" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "Interdite" -#: rhodecode/model/permission.py:86 +#: rhodecode/model/permission.py:87 msgid "Allowed with manual account activation" msgstr "" -#: rhodecode/model/permission.py:87 +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "" -#: rhodecode/model/permission.py:90 -msgid "Allow password recovery" -msgstr "" - #: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" +msgid "Allow password recovery" msgstr "" #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." -msgstr "" - -#: rhodecode/model/pull_request.py:119 +msgstr "Mis à jour réussi du pull request." + +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." -msgstr "" - -#: rhodecode/model/pull_request.py:121 +msgstr "La misa à jour du pull request a raté à cause d'une erreur inconnue." + +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." -msgstr "" - -#: rhodecode/model/pull_request.py:123 +msgstr "Pas de mise à jour nécessaire car la source et la cible n'ont pas changé." + +#: rhodecode/model/pull_request.py:122 msgid "" "Pull request cannot be updated because the reference type is not supported " "for an update. Only Branch, Tag or Bookmark is allowed." -msgstr "" - -#: rhodecode/model/pull_request.py:126 +msgstr "Le pull request ne peut pas être mis à jour car le type de référence n'est pas supporté pour une mise à jour. Seulement les branches,les labels et les marques pages sont autorisés." + +#: rhodecode/model/pull_request.py:125 msgid "" "This pull request cannot be updated because the target reference is missing." -msgstr "" - -#: rhodecode/model/pull_request.py:129 +msgstr "Ce pull request ne peut pas être mis à jour car la cible de référence est manquante." + +#: rhodecode/model/pull_request.py:128 msgid "" "This pull request cannot be updated because the source reference is missing." -msgstr "" - -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "" - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 -msgid "Server-side pull request merging is disabled." -msgstr "" - -#: rhodecode/model/pull_request.py:1154 -msgid "This pull request is closed." -msgstr "" +msgstr "Ce pull request ne peut pas être mis à jour car la source de référence est manquante." #: rhodecode/model/pull_request.py:1166 +msgid "Server-side pull request merging is disabled." +msgstr "" + +#: rhodecode/model/pull_request.py:1168 +msgid "This pull request is closed." +msgstr "" + +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "Signets" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "Dernier sommet" @@ -3638,32 +3757,32 @@ msgstr "Dernier sommet" 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." -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 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." -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "" -#: rhodecode/model/user.py:519 +#: rhodecode/model/user.py:523 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "" -#: rhodecode/model/user.py:528 +#: rhodecode/model/user.py:532 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3715,7 +3834,7 @@ msgstr "" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" +msgid "User group `%(usergroup)s` already exists" msgstr "" #: rhodecode/model/validators.py:226 @@ -3962,27 +4081,27 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "" "You do not have the permission to store repository groups in the root " "location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4022,440 +4141,454 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Envoi…" -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Lien vers la sélection" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Suivre ce dépôt" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" @@ -4468,7 +4601,7 @@ msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" @@ -4476,147 +4609,165 @@ msgstr "" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this " +"page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No branches available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No gists available yet." +msgid "No bookmarks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" -msgstr "Nouvelle requête de pull" +msgid "No user groups available yet." +msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 +msgid "Open new pull request" +msgstr "Nouvelle requête de pull" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "Envoyer" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Updating..." +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "" +"There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "Désactivé" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +msgstr "Activé" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "Fichiers" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "Chargement…" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +msgstr "Spécifier un commit" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} days" +msgstr "{0} jours" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +msgid "{0} hours" +msgstr "{0} heures" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +msgid "{0} months" +msgstr "{0} mois" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" -msgstr "" +msgstr "{0} années" #: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19 msgid "HelpDialog" -msgstr "" +msgstr "Dialogue d'aide" #: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19 msgid "MathML" @@ -4646,13 +4797,14 @@ msgstr "Tableau de bord" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "Filtre rapide…" @@ -4666,37 +4818,37 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add.mako:22 #: rhodecode/templates/admin/repos/repos.mako:27 msgid "Add Repository" -msgstr "" +msgstr "Ajouter un dépôt" #: rhodecode/templates/index_base.mako:34 #: rhodecode/templates/index_base.mako:42 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:27 msgid "Add Repository Group" -msgstr "" +msgstr "Ajouter un groupe de dépôts" #: rhodecode/templates/index_base.mako:45 msgid "You have admin right to this group, and can edit it" -msgstr "" +msgstr "Vous avez les droits d'administration sur ce groupe, et vous pouvez l'éditer." #: rhodecode/templates/index_base.mako:45 msgid "Edit Repository Group" -msgstr "" +msgstr "Editer le groupe de dépôts" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4706,12 +4858,15 @@ msgid "Name" msgstr "Nom" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4719,13 +4874,15 @@ msgstr "Nom" #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4733,48 +4890,51 @@ msgstr "Nom" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "Description" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "Dernière modification" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "Propriétaire" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "Dernière modification" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4791,7 +4951,7 @@ msgid "Home" msgstr "Accueil" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Connexion" @@ -4834,40 +4994,40 @@ msgstr "" #: rhodecode/templates/password_reset.mako:5 msgid "Reset Password" -msgstr "" +msgstr "Réinitialiser le mot de passe" #: rhodecode/templates/password_reset.mako:47 msgid "Reset your Password" -msgstr "" +msgstr "Réinitialiser votre mot de passe" #: rhodecode/templates/password_reset.mako:48 msgid "Go to the login page to sign in." -msgstr "" +msgstr "Allez à la page de login pour vous connecter." #: rhodecode/templates/password_reset.mako:52 msgid "Email Address" -msgstr "" +msgstr "Adresse de courriel" #: rhodecode/templates/password_reset.mako:61 #: rhodecode/templates/register.mako:85 msgid "Captcha" -msgstr "" +msgstr "Captcha" #: rhodecode/templates/password_reset.mako:71 msgid "Send password reset email" -msgstr "" +msgstr "Envoyer un courriel de changement de mot de passe" #: rhodecode/templates/password_reset.mako:72 msgid "Password reset link will be sent to matching email address" -msgstr "" +msgstr "Un lien de changement de mot de passe va être envoyé à l'adresse de courriel indiquée" #: rhodecode/templates/register.mako:5 msgid "Create an Account" -msgstr "" +msgstr "Créer un Compte" #: rhodecode/templates/register.mako:35 msgid "Create an account" -msgstr "" +msgstr "Créer un compte" #: rhodecode/templates/register.mako:36 msgid "Go to the login page to sign in with an existing account." @@ -4903,7 +5063,71 @@ msgstr "" #: rhodecode/templates/register.mako:104 msgid "Create Account" -msgstr "" +msgstr "Créer un Compte" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "Date" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "IP" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "Action" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "Données non disponibles pour le type d'entrées v1" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "Dépôt" #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 @@ -4915,88 +5139,54 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:68 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "Action" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "Dépôt" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "Date" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +msgstr "basculer vers" + +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" -msgstr "Aucune action n’a été enregistrée pour le moment." +msgstr "Pas d'actions pour le moment." #: rhodecode/templates/admin/auth/auth_settings.mako:5 #: rhodecode/templates/admin/auth/plugin_settings.mako:5 msgid "Authentication Settings" -msgstr "" +msgstr "Paramètres d'authentification" #: rhodecode/templates/admin/auth/auth_settings.mako:14 #: rhodecode/templates/admin/auth/plugin_settings.mako:14 msgid "Authentication Plugins" -msgstr "" +msgstr "Modules d'authentification" #: rhodecode/templates/admin/auth/auth_settings.mako:47 msgid "Enabled and Available Plugins" -msgstr "" +msgstr "Modules activés et disponibles" #: rhodecode/templates/admin/auth/auth_settings.mako:53 msgid "Enabled Plugins" -msgstr "" +msgstr "Modules activés" #: rhodecode/templates/admin/auth/auth_settings.mako:58 msgid "" @@ -5006,7 +5196,7 @@ msgstr "" #: rhodecode/templates/admin/auth/auth_settings.mako:65 msgid "Available Built-in Plugins" -msgstr "" +msgstr "Modules intégrés disponibles" #: rhodecode/templates/admin/auth/auth_settings.mako:81 #: rhodecode/templates/admin/auth/plugin_settings.mako:87 @@ -5014,13 +5204,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -5035,34 +5225,34 @@ msgstr "Enregistrer" #: rhodecode/templates/admin/auth/plugin_settings.mako:45 msgid "Plugin" -msgstr "" +msgstr "Module" #: rhodecode/templates/admin/defaults/defaults.mako:5 #: rhodecode/templates/admin/defaults/defaults.mako:14 msgid "Repositories defaults" -msgstr "" +msgstr "Valeurs par défaut des dépôts" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:3 msgid "Default Settings For New Repositories" -msgstr "" +msgstr "Paramêtres par défaut pour les nouveaux dépôts" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 -#: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Type" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" -msgstr "" +msgstr "Dépôt privé" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -5070,15 +5260,15 @@ msgstr "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés comme collaborateurs." #: rhodecode/templates/admin/defaults/defaults_repositories.mako:34 msgid "Enable Statistics" -msgstr "" +msgstr "Activer les statistiques" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:38 msgid "Enable a statistics window on the repository summary page." -msgstr "" +msgstr "Activer les statistiques sur la page du sommaire du dépôt" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:44 msgid "Enable Downloads" -msgstr "" +msgstr "Activer les Téléchargements" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:48 msgid "Enable the download option on the repository summary page." @@ -5097,46 +5287,46 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:5 #: rhodecode/templates/admin/gists/edit.mako:12 msgid "Edit Gist" -msgstr "" +msgstr "Editer le Gist" #: rhodecode/templates/admin/gists/edit.mako:33 #: rhodecode/templates/admin/gists/new.mako:30 msgid "Gist description ..." -msgstr "" +msgstr "Description du Gist ..." #: rhodecode/templates/admin/gists/edit.mako:38 #: rhodecode/templates/admin/gists/new.mako:38 msgid "Gist lifetime" -msgstr "" +msgstr "Durée de vie du Gist" #: rhodecode/templates/admin/gists/edit.mako:41 #: rhodecode/templates/admin/gists/new.mako:41 msgid "Gist access level" -msgstr "" +msgstr "Niveau d'accès du Gist" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "" #: rhodecode/templates/admin/gists/edit.mako:101 msgid "Update Gist" -msgstr "" +msgstr "Mettre à jour le Gist" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" -msgstr "" - -#: rhodecode/templates/admin/gists/edit.mako:122 +msgstr "Annuler" + +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " @@ -5157,7 +5347,7 @@ msgstr "" #: rhodecode/templates/admin/gists/index.mako:10 msgid "Public Gists" -msgstr "" +msgstr "Gists publics" #: rhodecode/templates/admin/gists/index.mako:24 #, python-format @@ -5166,16 +5356,16 @@ msgstr "" #: rhodecode/templates/admin/gists/index.mako:26 msgid "All Public Gists" -msgstr "" +msgstr "Tous les Gist publics" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" -msgstr "" +msgstr "Créer un nouveau Gist" #: rhodecode/templates/admin/gists/index.mako:56 msgid "All gists" -msgstr "" +msgstr "Tous les gist" #: rhodecode/templates/admin/gists/index.mako:58 msgid "All public" @@ -5194,14 +5384,14 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5210,6 +5400,7 @@ msgid "Author" msgstr "Auteur" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5218,7 +5409,7 @@ msgid "Created on" msgstr "Créé le" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "" @@ -5252,44 +5443,33 @@ msgstr "" msgid "Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:56 -#: rhodecode/templates/admin/integrations/list.mako:204 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:60 -#: rhodecode/templates/data_table/_dt_elements.mako:118 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#: rhodecode/templates/data_table/_dt_elements.mako:193 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "" @@ -5302,7 +5482,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "" @@ -5315,7 +5495,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 #: rhodecode/templates/base/base.mako:84 -#: rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Options" @@ -5337,67 +5517,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "Tous" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:115 -msgid "No {type} integrations for repo {repo} exist yet." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:117 -msgid "No {type} integrations for repogroup {repogroup} exist yet." -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:119 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:121 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5413,12 +5593,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "Mon compte" @@ -5437,26 +5617,35 @@ msgstr "" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/my_account/my_account.mako:40 msgid "Watched" msgstr "Surveillé" -#: rhodecode/templates/admin/my_account/my_account.mako:40 -#: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:241 +#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 msgid "Pull Requests" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5465,7 +5654,7 @@ msgstr "" msgid "Permissions" msgstr "Permissions" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5515,16 +5704,23 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "Ajouter" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5616,11 +5812,11 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5629,7 +5825,7 @@ msgstr "" msgid "Title" msgstr "Titre" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5638,41 +5834,97 @@ msgstr "" msgid "Repositories You Own" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "Créé" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "" +"SSH Keys usage is currently disabled, please ask your administrator to " +"enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "" +"Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-" +"sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "Aucune notification pour le moment." + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "Notification" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "Mes notifications" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 +msgid "Mark all as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 msgid "Comments" msgstr "Commentaires" -#: rhodecode/templates/admin/notifications/notifications.mako:37 -msgid "Mark all as read" -msgstr "" - -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "Aucune notification pour le moment." - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "Notification" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "Notifications" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5690,6 +5942,10 @@ msgid "IP Whitelist" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "" @@ -5730,32 +5986,45 @@ msgstr "" msgid "External Authentication Account Activation" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5810,6 +6079,14 @@ msgstr "" msgid "Default User Permissions Overview" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "" @@ -5826,16 +6103,21 @@ msgstr "" msgid "Group Name" msgstr "Nom du groupe" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "" @@ -5851,7 +6133,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "" @@ -5880,20 +6162,6 @@ msgstr "" msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" @@ -5903,64 +6171,64 @@ msgstr "Voulez-vous vraiment supprimer le groupe « %s » ?" msgid "Delete this repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "Propriétaire" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." @@ -5971,19 +6239,23 @@ msgstr "" msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "Parent du groupe" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " @@ -5998,7 +6270,7 @@ msgstr "" msgid "repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "" @@ -6015,51 +6287,51 @@ msgstr "" msgid "Clone from" msgstr "Cloner depuis" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -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." - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "" +"Plain text format with support of {metatags}. Add a README file for longer " +"descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:79 -msgid "Set the type of repository to create." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" +msgid "{} Creating repository" msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 @@ -6091,7 +6363,7 @@ msgid "Remote" msgstr "Dépôt distant" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "Statistiques" @@ -6200,7 +6472,7 @@ msgid "Delete forks" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Voulez-vous vraiment supprimer le dépôt %s ?" @@ -6225,6 +6497,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6263,7 +6544,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 @@ -6451,8 +6732,8 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "Groupe de dépôt" @@ -6470,9 +6751,9 @@ msgid "Remote uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "éditer" @@ -6507,32 +6788,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "Dépôt privé" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "Activer les statistiques" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "Afficher les statistiques sur la page du dépôt." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "Activer les téléchargements" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "Afficher le menu de téléchargements sur la page du dépôt." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -6627,7 +6908,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "Enregister les options" @@ -6727,7 +7008,7 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6912,6 +7193,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6969,10 +7259,6 @@ msgid "" "custom size" msgstr "" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7018,7 +7304,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:36 msgid "Gravatar URL" -msgstr "" +msgstr "URL du Gravatar" #: rhodecode/templates/admin/settings/settings_visual.mako:44 msgid "" @@ -7037,101 +7323,101 @@ msgstr "Meta-Tagging" #: rhodecode/templates/admin/settings/settings_visual.mako:64 msgid "Stylify recognised meta tags" -msgstr "" +msgstr "Mettre un style sur les meta tags reconnus" #: rhodecode/templates/admin/settings/settings_visual.mako:66 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +"Parses meta tags from repository or repository group description fields and " +"turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +msgstr "Elements du tableau de bord" + +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +msgstr "Page principale des éléments du tableau de bord" + +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "" "Number of items displayed in the main page dashboard before pagination is " "shown." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +msgstr "Nombre d'éléments affichés dans la page principale du tableau de bord avant que la pagination soit proposée." + +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +msgstr "Elements des pages d'administration." + +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." -msgstr "" +msgstr "Nombre d'éléments montrés sur les pages d'administration avant que la pagination soit proposée." + +#: rhodecode/templates/admin/settings/settings_visual.mako:106 +msgid "Commit ID Style" +msgstr "Style de l'ID de révision" + +#: rhodecode/templates/admin/settings/settings_visual.mako:110 +msgid "Commit sha length" +msgstr "Longueur du SHA de la révision" #: rhodecode/templates/admin/settings/settings_visual.mako:117 -msgid "Commit ID Style" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:121 -msgid "Commit sha length" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:128 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +msgstr "Nombre de caractères à montrer pour le SHA d'une révision dans l'interface web.\nPar défaut ce sera r123:9043a6a4c226 cette valeur définit la longueur du SHA après la partie `r123:` " + +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +msgstr "Montrer la référence numérique de l'ID de la révision" + +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +msgstr "Montrer le numéro de la révision dans le SHA du commit affiché dans l'interface.\nPar défaut, il est montré r123:9043a6a4c226 cette valeur définit le\nSi la partie `r123:` est montrée" + +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "Icônes" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "Afficher l’icône de dépôt public sur les dépôts" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "Afficher l’icône de dépôt privé sur les dépôts" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "" "Default renderer used to render comments, pull request descriptions and " "other description elements. After change old entries will still work " "correctly." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -7141,11 +7427,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7186,17 +7472,17 @@ msgid "%s user group settings" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "Membres" @@ -7213,54 +7499,59 @@ msgstr "" msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 -msgid "This group is set to be automatically synchronised." -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 +msgid "This group is set to be automatically synchronised." +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "" "Users will be added or removed from this group when they authenticate with " "RhodeCode system, based on LDAP group membership. This requires `LDAP+User " "group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, python-format msgid "" "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "" @@ -7294,7 +7585,7 @@ msgstr "" msgid "user groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7334,7 +7625,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7365,16 +7656,12 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "User Groups Management" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" +msgid "User Groups Management" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 @@ -7388,107 +7675,91 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "" "When this is enabled user will have to change they password when they next " "use RhodeCode system. This will also forbid vcs operations until someone " "makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 msgid "Users personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "" "When selecting the detach option, the depending objects owned by this user " @@ -7500,10 +7771,6 @@ msgstr "" msgid "User Audit Logs" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 -msgid "audit filter..." -msgstr "" - #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" @@ -7522,10 +7789,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7582,6 +7845,29 @@ msgstr "" msgid "Help translate %(rc_link)s into your language." msgstr "" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "" +"Below is a 2048 bit generated SSH RSA key. You can use it to access " +"RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" msgstr "Administration des utilisateurs" @@ -7623,141 +7909,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: rhodecode/templates/base/base.mako:228 -#: rhodecode/templates/data_table/_dt_elements.mako:12 -#: rhodecode/templates/data_table/_dt_elements.mako:13 -#: rhodecode/templates/data_table/_dt_elements.mako:153 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "Résumé" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "Historique" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Fichiers" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Comparer" -#: rhodecode/templates/base/base.mako:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "Options" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "Comparer le fork" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Rechercher" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "Fork" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "Historique" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "Historique" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 -msgid "Public journal" -msgstr "Journal public" - #: rhodecode/templates/base/base.mako:400 -msgid "Show Gists" -msgstr "" - -#: rhodecode/templates/base/base.mako:401 -msgid "Gists" -msgstr "" +msgid "Public journal" +msgstr "Journal public" #: rhodecode/templates/base/base.mako:405 +msgid "Show Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:406 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7779,15 +8065,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "" @@ -7897,9 +8183,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "" @@ -7907,77 +8193,94 @@ msgstr "" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "Montrer" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "Aucune" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "Lecture" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "Écriture" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "Administration" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "Permission" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "Éditer" -#: rhodecode/templates/base/perms_summary.mako:85 -msgid "Super admin" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:87 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 msgid "Repository default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:88 +#: rhodecode/templates/base/perms_summary.mako:120 msgid "Repository group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:89 +#: rhodecode/templates/base/perms_summary.mako:123 msgid "User group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:126 +msgid "Super admin" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "Création de dépôts" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "Forker les dépôts" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8100,93 +8403,74 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "" -"These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "" -"Use rebase instead of creating a merge commit when merging via web " -"interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "" "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -8194,16 +8478,40 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." msgstr "" +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "" +"Use rebase instead of creating a merge commit when merging via web " +"interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "" +"Close branch before merging it into destination branch. No effect when " +"rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -8218,8 +8526,8 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -8240,8 +8548,8 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -8253,55 +8561,54 @@ msgstr "" msgid "%s Changelog" msgstr "Historique de %s" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" @@ -8319,8 +8626,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8333,43 +8639,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "Fusion" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8377,7 +8688,7 @@ msgstr "Fusion" msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8390,102 +8701,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 +#: rhodecode/templates/changeset/changeset.mako:142 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:140 -msgid "Raw Diff" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:143 +msgid "Raw Diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:144 -msgid "Patch Diff" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:147 +msgid "Patch Diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8535,32 +8828,32 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:151 #: rhodecode/templates/changeset/changeset_file_comment.mako:154 msgid "Prev" -msgstr "" +msgstr "Précédent" #: rhodecode/templates/changeset/changeset_file_comment.mako:152 #: rhodecode/templates/changeset/changeset_file_comment.mako:155 msgid "Next" -msgstr "" +msgstr "Suivant" #: rhodecode/templates/changeset/changeset_file_comment.mako:190 msgid "Leave a comment on this Pull Request." -msgstr "" +msgstr "Laisser un commentaire sur ce Pull Request" #: rhodecode/templates/changeset/changeset_file_comment.mako:192 msgid "Leave a comment on {} commits in this range." -msgstr "" +msgstr "Laisser un commentaire sur les {} révisions dans cette plage." #: rhodecode/templates/changeset/changeset_file_comment.mako:194 msgid "Leave a comment on this Commit." -msgstr "" +msgstr "Laisser un commentaire sur cette révision." #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." -msgstr "" +msgstr "Vous devez vous connecter pour laisser un commentaire." #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Se connecter maintenant" @@ -8580,7 +8873,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Fermée" @@ -8598,15 +8891,8 @@ msgstr "Commentaire" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8618,31 +8904,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8650,91 +8918,73 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" -msgstr "" +msgstr "Afficher un grand diff peut prendre beaucoup de temps et de ressouces, voulez-vous continuez ?" #: rhodecode/templates/changeset/diff_block.mako:7 #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" -msgstr "" +msgstr "Montrer tous les diff" #: rhodecode/templates/changeset/diff_block.mako:10 msgid "The requested file is too big and its content is not shown." -msgstr "" +msgstr "Le ficier demandé est trop gros donc son contenu ne peut pas être affiché." #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 msgid "Diff was truncated. File content available only in full diff." -msgstr "" - -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "" -"%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +msgstr "Le diff est tronqué. Le contenu du fichier est seulement disponible en full diff." + +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:118 +msgstr "Voir les fichiers à la révision {}" + +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +msgstr "Voir les fichiers" + +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "" +"This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "" -"This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:415 #: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format @@ -8771,62 +9021,48 @@ msgstr "" #: rhodecode/templates/codeblocks/diffs.mako:645 msgid "Side by Side" -msgstr "" +msgstr "Côte à côte" #: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View unified" -msgstr "" +msgstr "Vue unifiée" #: rhodecode/templates/codeblocks/diffs.mako:650 msgid "Unified" -msgstr "" +msgstr "Unifié" #: rhodecode/templates/codeblocks/diffs.mako:660 msgid "Expand All Files" -msgstr "" +msgstr "Développer tous les fichiers" #: rhodecode/templates/codeblocks/diffs.mako:664 msgid "Collapse All Files" -msgstr "" +msgstr "Plier tous les fichiers" #: rhodecode/templates/codeblocks/diffs.mako:668 msgid "Wide Mode Diff" -msgstr "" - -#: rhodecode/templates/codeblocks/source.mako:24 +msgstr "Elargir le mode diff" + +#: rhodecode/templates/codeblocks/source.mako:25 msgid "view annotation from before this change" -msgstr "" +msgstr "Voir l'annotation avant ce changement" #: rhodecode/templates/compare/compare_commits.mako:5 msgid "Common Ancestor Commit" -msgstr "" +msgstr "Ancêtre commun de la révision" #: rhodecode/templates/compare/compare_commits.mako:8 msgid "Compare was calculated based on this shared commit." -msgstr "" +msgstr "La comparaison se base sur cette révision partagée" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" -msgstr "" - -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +msgstr "Temps" + +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" -msgstr "" +msgstr "Pas de révisions dans cette comparaison" #: rhodecode/templates/compare/compare_diff.mako:7 #: rhodecode/templates/compare/compare_diff.mako:9 @@ -8834,37 +9070,30 @@ msgstr "" msgid "%s Compare" msgstr "" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 #: rhodecode/templates/compare/compare_diff.mako:115 msgid "Compare Commits" -msgstr "" +msgstr "Comparer les révisions" #: rhodecode/templates/compare/compare_diff.mako:46 msgid "for file" -msgstr "" +msgstr "pour le fichier" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" -msgstr "" +msgstr "Cible" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" -msgstr "" +msgstr "Source" #: rhodecode/templates/compare/compare_diff.mako:103 #: rhodecode/templates/compare/compare_diff.mako:104 @@ -8873,84 +9102,81 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:122 msgid "Action unavailable in current view" -msgstr "" +msgstr "Action non disponible dans cette vue" #: rhodecode/templates/compare/compare_diff.mako:103 #: rhodecode/templates/compare/compare_diff.mako:111 #: rhodecode/templates/compare/compare_diff.mako:116 msgid "Swap" -msgstr "" +msgstr "Swap" #: rhodecode/templates/compare/compare_diff.mako:106 msgid "Compare commits, branches, bookmarks or tags." -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:49 +msgstr "Comparer les révisions, les branches, les marques pages ou les labels." + +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "Dépôt Mercurial" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "Dépôt Git" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:60 +msgstr "Dépôt Subversion" + +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "Dépôt public" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +msgstr "Pas encore de révisions" + +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "S’abonner au flux RSS de %s" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "S’abonner au flux ATOM de %s" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, 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] "" - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +msgstr "En cours de création" + +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "Privé" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" @@ -9252,13 +9478,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -9274,13 +9493,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9316,13 +9528,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9390,22 +9595,22 @@ msgid "Create New File" msgstr "" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "Commiter les changements" @@ -9444,11 +9649,11 @@ msgstr "Taille" #: rhodecode/templates/files/files_browser_tree.mako:7 msgid "Modified" -msgstr "" +msgstr "Modifié" #: rhodecode/templates/files/files_browser_tree.mako:8 msgid "Last Commit" -msgstr "" +msgstr "Dernière révision" #: rhodecode/templates/files/files_delete.mako:4 #, python-format @@ -9457,43 +9662,43 @@ msgstr "" #: rhodecode/templates/files/files_delete.mako:15 msgid "Delete file" -msgstr "" +msgstr "Supprimer le fichier" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "Fichier binaire (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" -msgstr "Ce fichier est trop gros pour être affiché." +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " +msgstr "" #: rhodecode/templates/files/files_delete.mako:70 msgid "Delete File" -msgstr "" +msgstr "Supprimer le fichier" #: rhodecode/templates/files/files_detail.mako:5 #: rhodecode/templates/files/files_detail.mako:12 msgid "Commit Description" -msgstr "" +msgstr "Description de la révision" #: rhodecode/templates/files/files_detail.mako:32 msgid "File last commit" -msgstr "" +msgstr "Fichier de la dernière révision" #: rhodecode/templates/files/files_detail.mako:46 msgid "Show/Diff file" -msgstr "" +msgstr "Montrer le diff du fichier" #: rhodecode/templates/files/files_detail.mako:61 msgid "Diff to Commit" -msgstr "" +msgstr "Diff de la révision" #: rhodecode/templates/files/files_detail.mako:62 msgid "Show at Commit" -msgstr "" +msgstr "Montrer à la révision" #: rhodecode/templates/files/files_edit.mako:4 #, python-format @@ -9502,11 +9707,11 @@ msgstr "" #: rhodecode/templates/files/files_edit.mako:15 msgid "Edit file" -msgstr "" +msgstr "Editer le fichier" #: rhodecode/templates/files/files_edit.mako:55 msgid "history" -msgstr "" +msgstr "Historique" #: rhodecode/templates/files/files_edit.mako:61 msgid "source" @@ -9517,15 +9722,15 @@ msgstr "Source" msgid "annotation" msgstr "annotation" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" -msgstr "" - -#: rhodecode/templates/files/files_edit.mako:74 +msgstr "télécharger" + +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "Édition du fichier" @@ -9533,62 +9738,55 @@ msgstr "Édition du fichier" msgid "Location" msgstr "Emplacement" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:8 +msgstr "Ce fichier est un pointeur vers un gros fichier binaire" + +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/files/files_source.mako:17 +msgstr "Gros fichier" + +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "Historique" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 -msgid "Annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 -msgid "Raw" -msgstr "" +msgstr "Montrer tout l'historique" #: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 +msgid "Annotation" +msgstr "Annotation" + +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 +msgid "Raw" +msgstr "Brut" + +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Téléchargements" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9602,22 +9800,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "Nom du fork" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "Copier les permissions" -#: rhodecode/templates/forks/fork.mako:97 +#: rhodecode/templates/forks/fork.mako:102 msgid "Copy permissions from forked repository" msgstr "Copier les permissions depuis le dépôt forké" -#: rhodecode/templates/forks/fork.mako:102 +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "" @@ -9630,34 +9829,23 @@ msgstr "Forks de %s" msgid "Forks" msgstr "Forks" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "Il n’y a pas encore de forks." - -#: rhodecode/templates/journal/journal.mako:13 -msgid "Filter" -msgstr "" - #: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/journal/journal.mako:23 +msgid "Filter" +msgstr "" + +#: rhodecode/templates/journal/journal.mako:24 msgid "ATOM journal feed" msgstr "Flux ATOM du journal" -#: rhodecode/templates/journal/journal.mako:24 +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "Flux RSS du journal" @@ -9666,15 +9854,15 @@ msgid "No entries yet" msgstr "Aucune entrée pour le moment" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "Journal public" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "Flux ATOM du journal public" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "Flux RSS du journal public" @@ -9704,22 +9892,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "Relecteurs de la requête de pull" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9732,13 +9920,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9763,26 +9944,26 @@ msgstr "" msgid "Merge is not currently possible because of below failed checks." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9803,171 +9984,175 @@ msgstr "Veuillez confirmer la suppression de cette requête de pull." msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +msgstr "Fusionner" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +msgstr "Les données du dépôt caché ne sont pas disponible" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 -#, python-format -msgid "calculated based on %s reviewer vote" -msgid_plural "calculated based on %s reviewers votes" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 +msgstr "Revue" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 -msgid "{} version available for this pull request, show it." -msgid_plural "{} versions available for this pull request, show them." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 +msgstr "Versions" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" +msgstr "Cacher toutes les versions de ce pull request" #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "Votre statut de revue de ce pull request" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 -#, python-format -msgid "%d General " -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 +msgid "Mandatory reviewer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "" "These commits cannot be displayed, because this repository uses the " "Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 msgid "" "This pull request cannot be displayed, because one or more commits no longer" " exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 msgid "" "Please update this pull request, push the commits back into the source " "repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 msgid "" "Commits and changes between v{ver_from} and {ver_to} of this pull request, " "commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -10064,100 +10249,90 @@ msgstr "" #: rhodecode/templates/search/search_commit.mako:11 msgid "Age (new first)" -msgstr "" +msgstr "Age (nouveau en premier)" #: rhodecode/templates/search/search_commit.mako:13 msgid "Age (old first)" -msgstr "" - -#: rhodecode/templates/search/search_content.mako:33 +msgstr "Age (plus vieux en premier)" + +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "" #: rhodecode/templates/search/search_path.mako:4 msgid "File" -msgstr "" - -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "Résumé de %s" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "" +msgstr "Fichier" #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 -msgid "Show by Name" -msgstr "Afficher par nom" - -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 -msgid "Show by ID" -msgstr "Afficher par ID" +msgstr "URL en lecture seule" #: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 +msgid "Show by Name" +msgstr "Afficher par nom" + +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 +msgid "Show by ID" +msgstr "Afficher par ID" + +#: rhodecode/templates/summary/components.mako:61 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "URL de clone" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt." -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés." -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "Les téléchargements sont désactivés pour ce dépôt." -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" -msgstr "" +msgstr "Activer les téléchargements" #: rhodecode/templates/summary/summary.mako:17 #: rhodecode/templates/summary/summary.mako:19 @@ -10173,13 +10348,28 @@ msgstr "Démarrage rapide" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "Résumé de %s" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" -msgstr "" +msgstr "Ajouter ou uploader des fichiers via RhodeCode:" #: rhodecode/templates/summary/summary_commits.mako:111 msgid "Push new repo:" -msgstr "" +msgstr "Pousser le nouveau dépôt:" #: rhodecode/templates/summary/summary_commits.mako:122 msgid "Existing repository?" @@ -10196,19 +10386,19 @@ msgstr "Tags" #: rhodecode/templates/tags/tags.mako:31 msgid "Compare Selected Tags" -msgstr "" +msgstr "Comparer les labels selectionnés" #: rhodecode/templates/users/user_profile.mako:35 msgid "First name" -msgstr "" +msgstr "Prénom" #: rhodecode/templates/users/user_profile.mako:43 msgid "Last name" -msgstr "" +msgstr "Nom" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" -msgstr "" +msgstr "bonjour" #: rhodecode/tests/lib/test_ext_json.py:163 msgid "singular" diff --git a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-27 17:25+0200\n" -"PO-Revision-Date: 2017-06-27 15:26+0000\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" +"PO-Revision-Date: 2017-11-03 15:43+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Italian (http://www.transifex.com/rhodecode/RhodeCode/language/it/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "Globale" @@ -89,17 +89,86 @@ msgid "System Info" msgstr "Informazioni sistema" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" +msgid "Processes" msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "Laboratori" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "Impostazioni di default aggiornate" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "Errore avvenuto durante l'aggiornamento dei valori di default" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "Permessi applicati con successo." + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "Errore durante l'aggiornamento dei permessi" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "Permessi sull'oggetto aggiornati." + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "Permessi globali aggiornati correttamente" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "Modifica" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "Creato gruppo di repository %s" + +#: rhodecode/apps/admin/views/repo_groups.py:198 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "Errore durante la creazione del gruppo di repository %s" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "" @@ -262,272 +331,858 @@ msgstr "" msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "Non si hanno i permessi per editare l'utente" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "per sempre" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "5 minuti" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "1 ora" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "1 giorno" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "1 mese" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "a vita" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "Creato il gruppo utenti %(user_group_link)s" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "Errore avvenuto durante la creazione del gruppo di utenti %s" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "Creato l'utente %(user_link)s" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "Errore durante la creazione dell'utente %s" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "Utente aggiornato correttamente" + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "Errore durante l'aggiornamento dell'utente %s" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "Distaccati %s repository" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr "%s repository cancellati" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "Distaccati %s gruppi di repository" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "%s gruppo di repository cancellati" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "Distaccati %s gruppi utente" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "%s gruppi utente cancellati" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "Utente eliminato" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "Errore durante la cancellazione dell'utente" + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "Permessi globali Utente aggiornati" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "Errore avvenuto durante il salvataggio dei permessi" + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "Obbligo del cambiamento password disabilitato per l'utente" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "Obbligo del cambio password abilitato per l'utente" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "Errore durante il ripristino della password dell'utente" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "Creato il gruppo di repository `%s`" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "Errore durante la creazione del gruppo di repository per l'utente" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "Ruolo" -#: rhodecode/apps/admin/views/users.py:217 -#: rhodecode/apps/my_account/views.py:191 +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" msgstr "Token Autorizzativo creato" -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" msgstr "Token autorizzativo cancellato" -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "Errore durante il salvataggio dell'email" -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "Errore durante il salvataggio dell'ip: %s" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" msgstr "Errore durante il salvataggio dell'ip" -#: rhodecode/apps/admin/views/users.py:393 +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "Aggiunti gli ip %s alla 'whitelist' dell'utente" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" msgstr "Indirizzo ip rimosso dalla 'whitelist' dell'utente" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "per sempre" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "5 minuti" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "1 ora" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "1 giorno" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "1 mese" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "a vita" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "Richiede un account registrato" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "Può essere acceduto da utenti anonimi" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "Errore durante la creazione del 'gist'" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "'Gist' %s eliminato" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/data_table/_dt_elements.mako:323 +msgid "never" +msgstr "mai" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "%(expiry)s - valore corrente" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "Contenuto del 'gist' aggiornato" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "Proprieta' del 'gist' aggiornate" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "Errore durante l'aggiornamento del 'gist' %s" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 #: rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "Repositories" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "Gruppi" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "journal pubblico" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "journal" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:279 +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" msgstr "La registrazione con RhodeCode ha avuto successo" -#: rhodecode/apps/login/views.py:315 +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:321 +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:410 +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "Reset della password confermato. Una nuova password è stata inviata alla tua email" -#: rhodecode/apps/my_account/views.py:125 +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" msgstr "Errore durante l'aggiornamento della password" -#: rhodecode/apps/my_account/views.py:132 +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" msgstr "Password aggiornata correttamente" -#: rhodecode/apps/my_account/views.py:281 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:70 +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "Account aggiornato correttamente" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "Errore durante l'eliminazione del gruppo di repository %s" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "Impossibile cambiare i permessi per se stessi come admin" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "Permessi del gruppo di repository aggiornati" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "Errore durante l'aggiornamento del gruppo di repository %s" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" msgstr "Cache invalidata" -#: rhodecode/apps/repository/views/repo_caches.py:74 +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "Errore durante l'invalidazione della cache" -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "Nessun commit" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "Repository %s creato da %s" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "Fork del repository %s come %s" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "Repository %s creato" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "Mostra caratteri di spaziatura" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "Mostra caratteri di spaziatura per tutti i DIFF" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "Ignora caratteri di spaziatura" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "Ignora caratteri di spaziatura per tutti i DIFF" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "Allarga il contesto" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "Allarga il contesto per tutti i DIFF" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "Cambiamento stato %(transition_icon)s %(status)s" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "" +"Changing the status of a commit associated with a closed pull request is not" +" allowed" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "Seleziona una commit" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "" +"Repositories unrelated. Cannot compare commit %(commit1)s from repository " +"%(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "Cambiamenti sul repository %s " + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "%s %s feed" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "Il repository è stato bloccato da %s il %s" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "Clicca qui per aggiungere un file" + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "Nessun file selezionato. %s" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "Downloads disabilitati" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "Repository vuoto" + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "Formato archivio sconosciuto" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "Changesets" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "Branches" + +#: rhodecode/apps/repository/views/repo_files.py:890 +#: rhodecode/model/scm.py:791 rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "Tags" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "Un errore e' avvenuto durante l'operazione di commit" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "Nessuna modifica" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "File aggiunto via RhodeCode Enterprise" + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "Nome file mancante" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "" +"The location specified must be a relative path and must not contain .. in " +"the path" +msgstr "La locazione specificata deve essere un path relativo ma non deve contenere .. " + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "Confronta FORK" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Errore durante il fork del repository %s" + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" msgstr "Permessi sul repository aggiornati" +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +msgid "Pull request requires a title with min. 3 chars" +msgstr "La 'pull request' deve avere un titolo di almeno 3 caratteri" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "'Pull request' aperta correttamente" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "Non è possibile aggiornare richieste PULL già chiuse" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "Titolo e Descrizione della richiesta PULL aggiornati." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "" +"Pull request updated to \"{source_commit_id}\" with {count_added} added, " +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "'Pull request' eliminata con successo" + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" +msgstr "" + #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "Sbloccato" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "Bloccato" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "Il repository e' stato %s" + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "Errore durante lo sblocco" + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "Errore durante l'eliminazione delle statistiche del repository" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "Delocalizzazione del fork %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "Cancellati %s fork" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "" "Cannot delete `{repo}` it still contains attached forks. Try using " "{delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "Visibilita' del repository nel journal pubblico aggiornata" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 msgid "An error occurred during setting this repository in public journal" msgstr "Errore durante l'impostazione del repository nel journal pubblico" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "Nulla" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Il repository %s e' stato marcato come fork di %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "Errore durante il completamento dell'operazione" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" msgstr "Repository bloccato" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" msgstr "Repository sbloccato" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "Errore durante lo sblocco" - -#: rhodecode/apps/repository/views/repo_summary.py:293 +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "Errore durante la crezione del campo" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "Errore durante la rimozione del campo" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "Errore durante la rimozione dell'entry dall'issue tracker" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "Entry dell'issue tracker rimossa" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "Dati dell'Issue Tracker aggiornati" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "Effettuato 'Pull' dal remoto" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "Errore durante il 'Pull' dal remoto" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "Ci son dati non validi tra i dati immessi" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "Impostazioni VCS aggiornate" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "Errore durante l'aggiornamento delle impostazioni del repository VCS" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" msgstr "Branch" -#: rhodecode/apps/repository/views/repo_summary.py:294 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" msgstr "Tag" -#: rhodecode/apps/repository/views/repo_summary.py:295 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" msgstr "Segnalibro" -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "Branches" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" msgstr "Branch chiusi" +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "Gruppo utenti %s aggiornato" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "Errore durante l'aggiornamento del gruppo utenti %s" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "Gruppo utenti eliminato" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "Errore avvenuto durante l'eliminazione del gruppo utenti" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "Il gruppo di destinazione non può coincidere con l'origine" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "Permessi del gruppo utenti aggiornati" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "Permessi globali dei Gruppi Utenti aggiornati." + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" msgstr "" #: rhodecode/authentication/schema.py:35 @@ -535,21 +1190,21 @@ msgid "Enable or disable this authentica msgstr "" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" msgstr "Abilitato" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication responsecall for this plugin. \n" -"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:49 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" msgstr "" @@ -558,15 +1213,15 @@ msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:177 +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:187 +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." msgstr "" @@ -653,7 +1308,6 @@ msgid "The url of the Jasig CAS REST ser msgstr "" #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "URL" @@ -692,10 +1346,11 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Password" @@ -786,7 +1441,7 @@ msgstr "" msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:365 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" msgstr "" @@ -819,476 +1474,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "Nessun commit" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "Mostra caratteri di spaziatura" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "Mostra caratteri di spaziatura per tutti i DIFF" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "Ignora caratteri di spaziatura" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "Ignora caratteri di spaziatura per tutti i DIFF" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "Allarga il contesto" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "Allarga il contesto per tutti i DIFF" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "" - -#: rhodecode/controllers/changeset.py:343 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "Cambiamento stato %(transition_icon)s %(status)s" - -#: rhodecode/controllers/changeset.py:387 -msgid "" -"Changing the status of a commit associated with a closed pull request is not" -" allowed" -msgstr "" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "Seleziona una commit" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "" -"Repositories unrelated. Cannot compare commit %(commit1)s from repository " -"%(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "Cambiamenti sul repository %s " - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "%s %s feed" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "Clicca qui per aggiungere un file" - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "Nessun file selezionato. %s" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "Il repository è stato bloccato da %s il %s" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "Puoi eliminare solo file appartenenti ad una revisione con un branch valido" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "Un errore e' avvenuto durante l'operazione di commit" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -msgid "You can only edit files with revision being a valid branch " -msgstr "Puoi modificare solo file appartenenti ad una revisione con un branch valido" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "Nessuna modifica" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "File aggiunto via RhodeCode Enterprise" - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "Nome file mancante" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "" -"The location specified must be a relative path and must not contain .. in " -"the path" -msgstr "La locazione specificata deve essere un path relativo ma non deve contenere .. " - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "Downloads disabilitati" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "Revisione %s sconosciuta" - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "Repository vuoto" - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "Formato archivio sconosciuto" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "Changesets" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "Tags" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "Errore durante il fork del repository %s" - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "journal pubblico" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "journal" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:216 -msgid "Pull request requires a title with min. 3 chars" -msgstr "La 'pull request' deve avere un titolo di almeno 3 caratteri" - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "'Pull request' aperta correttamente" - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "Non è possibile aggiornare richieste PULL già chiuse" - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "Titolo e Descrizione della richiesta PULL aggiornati." - -#: rhodecode/controllers/pullrequests.py:346 -msgid "" -"Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "'Pull request' eliminata con successo" - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "Impostazioni di default aggiornate" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "Errore avvenuto durante l'aggiornamento dei valori di default" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "Richiede un account registrato" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "Può essere acceduto da utenti anonimi" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "Errore durante la creazione del 'gist'" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "'Gist' %s eliminato" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "Contenuto del 'gist' aggiornato" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "Proprieta' del 'gist' aggiornate" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "Errore durante l'aggiornamento del 'gist' %s" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -msgid "never" -msgstr "mai" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "%(expiry)s - valore corrente" - -#: rhodecode/controllers/admin/my_account.py:70 -msgid "You can't edit this user since it's crucial for entire application" -msgstr "Utente critico per l'intera applicazione. Editing disabilitato." - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "Account aggiornato correttamente" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "Errore durante l'aggiornamento dell'utente %s" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "Permessi applicati con successo." - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "Errore durante l'aggiornamento dei permessi" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "Permessi sull'oggetto aggiornati." - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "Permessi globali aggiornati correttamente" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "Creato gruppo di repository %s" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "Errore durante la creazione del gruppo di repository %s" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "Gruppo di repository %s aggiornato" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, python-format -msgid "Error occurred during update of repository group %s" -msgstr "Errore durante l'aggiornamento del gruppo di repository %s" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "Questo gruppo contiene %(num)d repository e non può essere cancellato." -msgstr[1] "Questo gruppo contiene %(num)d repository e non può essere cancellato." - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "Questo gruppo contiene %(num)d sotto-gruppo e non può essere eliminato" -msgstr[1] "Questo gruppo contiene %(num)d sotto-gruppi e non può essere eliminato" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "Gruppo di repository %s eliminato" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, python-format -msgid "Error occurred during deletion of repository group %s" -msgstr "Errore durante l'eliminazione del gruppo di repository %s" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "Impossibile cambiare i permessi per se stessi come admin" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "Permessi del gruppo di repository aggiornati" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "Errore durante la creazione del repository %s: certificato invalido" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "Errore durante la creazione del repository %s" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "Repository %s creato da %s" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "Fork del repository %s come %s" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "Repository %s creato" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "Errore durante la crezione del campo" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "Errore durante la rimozione del campo" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "Sbloccato" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "Bloccato" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "Il repository e' stato %s" - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "Effettuato 'Pull' dal remoto" - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "Errore durante il 'Pull' dal remoto" - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "Errore durante l'eliminazione delle statistiche del repository" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "Errore durante la rimozione dell'entry dall'issue tracker" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "Entry dell'issue tracker rimossa" - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "Dati dell'Issue Tracker aggiornati" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "Ci son dati non validi tra i dati immessi" - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "Errore durante l'aggiornamento delle impostazioni del repository VCS" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "Impostazioni VCS aggiornate" - #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" @@ -1339,205 +1524,59 @@ msgstr "Errore durante l'aggiornamento d msgid "Updated Labs settings" msgstr "Impostazioni sui Lab aggiornate" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "Creato il gruppo utenti %(user_group_link)s" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "Errore avvenuto durante la creazione del gruppo di utenti %s" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "Gruppo utenti %s aggiornato" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "Errore durante l'aggiornamento del gruppo utenti %s" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "Gruppo utenti eliminato" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "Errore avvenuto durante l'eliminazione del gruppo utenti" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "Il gruppo di destinazione non può coincidere con l'origine" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "Permessi del gruppo utenti aggiornati" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "Permessi globali dei Gruppi Utenti aggiornati." - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "Errore avvenuto durante il salvataggio dei permessi" - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "Creato l'utente %(user_link)s" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "Errore durante la creazione dell'utente %s" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "Utente aggiornato correttamente" - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "Distaccati %s repository" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr "%s repository cancellati" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "Distaccati %s gruppi di repository" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "%s gruppo di repository cancellati" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "Distaccati %s gruppi utente" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "%s gruppi utente cancellati" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "Utente eliminato" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "Errore durante la cancellazione dell'utente" - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "Obbligo del cambiamento password disabilitato per l'utente" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "Obbligo del cambio password abilitato per l'utente" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "Errore durante il ripristino della password dell'utente" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "Creato il gruppo di repository `%s`" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "Errore durante la creazione del gruppo di repository per l'utente" - -#: rhodecode/controllers/admin/users.py:396 -msgid "" -"The user participates as reviewer in pull requests and cannot be deleted. " -"You can set the user to \"inactive\" instead of deleting it." -msgstr "" - -#: rhodecode/controllers/admin/users.py:462 -msgid "User global permissions updated successfully" -msgstr "Permessi globali Utente aggiornati" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:166 +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "" @@ -1573,54 +1612,60 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 -#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "Ripristina" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1659,28 +1704,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1764,17 +1809,19 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1810,132 +1857,158 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:166 -msgid "" -"URL of the webhook to receive POST event. Following variables are allowed to" -" be used: {vars}. Some of the variables would trigger multiple calls, like " +#: rhodecode/integrations/types/webhook.py:179 +msgid "" +"URL to which Webhook should submit data. Following variables are allowed to " +"be used: {vars}. Some of the variables would trigger multiple calls, like " "${{branch}} or ${{commit_id}}. Webhook will be called as many times as " "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "" +"Optional string used to validate received payloads. It will be sent together" +" with event data in JSON" msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr " [eliminato] repository" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "repository [creato]" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "[creato] repository come fork" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "[forked] repository" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "[aggiornato] repository" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "[scaricato] archivio dal repository" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "[elimina] repository" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "[creato] utente" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "[aggiornato] utente" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "[creato] gruppo utenti" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "[aggiornato] gruppo utenti" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "[commentato] al commit nel repository" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "[commentato] sulla richiesta di 'Pull' per" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "[chiusa] Richiesta di 'Pull' per" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" msgstr "[merged] richiesta pull per" -#: rhodecode/lib/action_parser.py:148 +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "[pushed] nel" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "[committato via Rhodecode] nel repository" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "[pulled da remoto] nel repository" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "[pulled] da" -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "[da ora segui] repository" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "[non segui più] repository" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "Nome del 'fork' %s" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1946,52 +2019,42 @@ msgstr "Richiesta di 'Pull' #%s" msgid "Show all combined commits %s->%s" msgstr "Mostra tutte le commit combinate %s->%s" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "vista comparativa" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "Eliminato il branch: %s" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "Creato il tag: %s" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" msgstr "Commit non trovata" -#: rhodecode/lib/auth.py:1220 +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "IP %s non consentito" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 msgid "You need to be a registered user to perform this action" msgstr "È necessario essere utenti registrati per eseguire l'azione" -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "Azione non supportata per %s." - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" msgstr "Bisogna autenticarsi per vedere questa pagina" -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "Il repository in %(repo_name)s non può essere localizzato." - #: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" @@ -2009,20 +2072,11 @@ msgstr "Il changeset è troppo lungo ed è stato troncato. Usa il menù 'diff' per visualizzare tutte le differenze" msgid "No changes detected" msgstr "Nessun cambiamento rilevato" -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr "e %s ulteriore/i" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "Nessun file" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2042,7 +2096,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2056,54 +2110,54 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, 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 "Il repository %s non ha corrispondenze nel db. Probabilmente è stato creato o rinominato direttamente sul filesystem. Provare ad avviare nuovamente l'applicazione per consentire la ri-scansione dei repository" -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "proprio ora" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2120,24 +2174,25 @@ msgstr "proprio ora" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 +#: rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "Repository nessun accesso" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2154,24 +2209,25 @@ msgstr "Repository nessun accesso" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 +#: rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "Repository accesso in lettura" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2188,24 +2244,25 @@ msgstr "Repository accesso in lettura" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 +#: rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "Repository accesso in scrittura" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2222,48 +2279,49 @@ msgstr "Repository accesso in scrittura" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/model/db.py:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 +#: rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "Repository accesso admin" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "Gruppo di repository: nessun accesso" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "Gruppo di repository: accesso in lettura" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "Gruppo di repository: accesso in scrittura" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "Gruppo di repository: accesso admin" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2279,7 +2337,7 @@ msgstr "Gruppo di repository: accesso ad msgid "RhodeCode Administrator" msgstr "RhodeCode Administrator" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2296,24 +2354,25 @@ msgstr "RhodeCode Administrator" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 +#: rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "Creazione di Repository disabilitata" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2330,24 +2389,25 @@ msgstr "Creazione di Repository disabili #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/model/db.py:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 +#: rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "Creazione di Repository abilitata" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2364,24 +2424,25 @@ msgstr "Creazione di Repository abilitat #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 -#: rhodecode/model/db.py:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 +#: rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "Forking Repository disabilitato" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2398,45 +2459,46 @@ msgstr "Forking Repository disabilitato" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 +#: rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "Forking Repository abilitato" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "Registrazione disabilitata" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "Registrazione nuovo utente con RhodeCode e attivazione manuale" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "Registrazione nuovo utente attraverso RhodeCode e attivazione automatica" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2453,24 +2515,25 @@ msgstr "Registrazione nuovo utente attra #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 -#: rhodecode/model/db.py:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 +#: rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "Non Revisionato" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2487,24 +2550,25 @@ msgstr "Non Revisionato" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 -#: rhodecode/model/db.py:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 +#: rhodecode/model/db.py:3325 msgid "Approved" msgstr "Approvato" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2521,24 +2585,25 @@ msgstr "Approvato" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 -#: rhodecode/model/db.py:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 +#: rhodecode/model/db.py:3326 msgid "Rejected" msgstr "Rifiutato" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2555,20 +2620,21 @@ msgstr "Rifiutato" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 -#: rhodecode/model/db.py:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 +#: rhodecode/model/db.py:3327 msgid "Under Review" msgstr "in Revisione" @@ -2586,20 +2652,21 @@ msgstr "in Revisione" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 +#: rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "Gruppo di repository: nessun accesso" @@ -2617,20 +2684,21 @@ msgstr "Gruppo di repository: nessun acc #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 +#: rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "Gruppo di repository: accesso in lettura" @@ -2648,20 +2716,21 @@ msgstr "Gruppo di repository: accesso in #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 +#: rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "Gruppo di repository: accesso in scrittura" @@ -2679,20 +2748,21 @@ msgstr "Gruppo di repository: accesso in #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/model/db.py:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 +#: rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "Gruppo di repository: accesso admin" @@ -2709,20 +2779,21 @@ msgstr "Gruppo di repository: accesso ad #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 +#: rhodecode/model/db.py:2605 msgid "User group no access" msgstr "Gruppo utenti: nessun accesso" @@ -2739,20 +2810,21 @@ msgstr "Gruppo utenti: nessun accesso" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/model/db.py:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 +#: rhodecode/model/db.py:2606 msgid "User group read access" msgstr "Gruppo utenti: accesso in lettura" @@ -2769,20 +2841,21 @@ msgstr "Gruppo utenti: accesso in lettur #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 +#: rhodecode/model/db.py:2607 msgid "User group write access" msgstr "Gruppo utenti: accesso in scrittura" @@ -2799,20 +2872,21 @@ msgstr "Gruppo utenti: accesso in scritt #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 +#: rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "Gruppo utenti: accesso admin" @@ -2829,20 +2903,21 @@ msgstr "Gruppo utenti: accesso admin" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 +#: rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "Creazione gruppo di repository disabiltiata" @@ -2859,20 +2934,21 @@ msgstr "Creazione gruppo di repository d #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 +#: rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "Creazione gruppo di repository abilitata" @@ -2889,20 +2965,21 @@ msgstr "Creazione gruppo di repository a #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 +#: rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "Creazione gruppo utenti disabilitata" @@ -2919,20 +2996,21 @@ msgstr "Creazione gruppo utenti disabili #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 +#: rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "Creazione gruppo utenti abilitata" @@ -2949,20 +3027,21 @@ msgstr "Creazione gruppo utenti abilitat #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/model/db.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 +#: rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "Registrazione disabilitata" @@ -2979,20 +3058,21 @@ msgstr "Registrazione disabilitata" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 -#: rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 +#: rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "Registrazione utente con attivazione manuale dell'account" @@ -3009,20 +3089,21 @@ msgstr "Registrazione utente con attivaz #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 +#: rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "Registrazione utente con attivazione automatica dell'account" @@ -3039,20 +3120,21 @@ msgstr "Registrazione utente con attivaz #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 -#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 +#: rhodecode/model/db.py:2632 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "Attivazione manuale di account esterni" @@ -3069,20 +3151,21 @@ msgstr "Attivazione manuale di account e #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 -#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 +#: rhodecode/model/db.py:2633 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "Attivazione automatrica di account esterni" @@ -3093,20 +3176,21 @@ msgstr "Attivazione automatrica di accou #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 +#: rhodecode/model/db.py:2618 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "Creazione di repository abilitata con permessi di scrittura al gruppo di repository" @@ -3118,20 +3202,21 @@ msgstr "Creazione di repository abilitat #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 +#: rhodecode/model/db.py:2619 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "Creazione di repository disabilitata abilitata con permessi di scrittura al gruppo di repository" @@ -3140,80 +3225,75 @@ msgstr "Creazione di repository disabili #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 +#: rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "RhodeCode Super Administrator" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 +#: rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 -#: rhodecode/model/db.py:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 -#: rhodecode/model/db.py:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 +#: rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto abilitata" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 -msgid "all" -msgstr "tutti" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" -msgstr "interfaccia http/web" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 +#: rhodecode/model/db.py:1099 +msgid "all" +msgstr "tutti" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 @@ -3221,9 +3301,11 @@ msgstr "interfaccia http/web" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" -msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 +#: rhodecode/model/db.py:1100 +msgid "http/web interface" +msgstr "interfaccia http/web" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 @@ -3231,9 +3313,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" -msgstr "chiamate API" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 +#: rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 @@ -3241,36 +3325,54 @@ msgstr "chiamate API" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 +#: rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "chiamate API" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 +#: rhodecode/model/db.py:1103 msgid "feed access" msgstr "accesso al feed" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 -#: rhodecode/model/db.py:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 +#: rhodecode/model/db.py:2356 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 -#: rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 +#: rhodecode/model/db.py:2628 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/model/db.py:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 +#: rhodecode/model/db.py:2629 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/model/db.py:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 +#: rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3306,112 +3408,128 @@ msgstr "Ultimo aggiornamento" msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:374 -msgid "made a comment" +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" msgstr "" #: rhodecode/model/comment.py:375 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "Prego specificare una login" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Inserire un valore di almeno %(min)i caratteri" -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "Prego inserire una password" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "Inserire almeno %(min)i caratteri" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "%(user)s ha commentato il commit %(date_or_age)s" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "%(user)s ha commentato il commit il %(date_or_age)s" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "%(user)s ha inviato un messaggio %(date_or_age)s" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "%(user)s ha inviato un messaggio il %(date_or_age)s" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "%(user)s ti ha menzionato %(date_or_age)s" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "%(user)s ti ha menzionato il %(date_or_age)s" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "%(user)s registrato in RhodeCode %(date_or_age)s" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "%(user)s registrato in RhodeCode il %(date_or_age)s" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "%(user)s ha aperto una richiesta PULL %(date_or_age)s" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "%(user)s ha aperto una richiesta PULL il %(date_or_age)s" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "%(user)s ha commenato la richiesta PULL %(date_or_age)s" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "%(user)s ha commentato la richiesta PULL il %(date_or_age)s" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 +#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 +#: rhodecode/model/permission.py:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "None" -#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 -#: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 +#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 +#: rhodecode/model/permission.py:81 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "Lettura" -#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 -#: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3419,8 +3537,8 @@ msgstr "Lettura" msgid "Write" msgstr "Scrittura" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3434,7 +3552,7 @@ msgstr "Scrittura" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3449,189 +3567,189 @@ msgstr "Scrittura" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "Admin" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "Disabilitato" -#: rhodecode/model/permission.py:86 +#: rhodecode/model/permission.py:87 msgid "Allowed with manual account activation" msgstr "Consentita con attivazione account manuale" -#: rhodecode/model/permission.py:87 +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "Consentito con attivazione account automatica" -#: rhodecode/model/permission.py:90 +#: rhodecode/model/permission.py:91 msgid "Allow password recovery" msgstr "" -#: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" -msgstr "" - #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "Questa richiesta PULL può essere incorporata automaticamente." -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "Questa richiesta PULL non può essere incorporata a causa di un eccezione non gestita" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "Questa richiesta PULL non può esere incorporata perché è fallito il PUSH sul target." -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "Questa richiesta PULL non può essere incorporata perché il target indicato non è la versione di testa (head)." -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "Questa richiesta PULL non può esser incorporata perché la sorgente contiene un numero superiore di branch rispetto al target" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "Questa richiesta di PULL non può essere incorporata perché il target ha versioni di testa multiple" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "La richiesta PULL non può essere \"merged\" poiché il repository target è \"locked\"" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "La \"richiesta di PULL\" non può essere incorporata poichè manca il riferimento alla sorgente o alla destinazione" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:119 +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:121 +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:123 +#: rhodecode/model/pull_request.py:122 msgid "" "Pull request cannot be updated because the reference type is not supported " "for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:126 +#: rhodecode/model/pull_request.py:125 msgid "" "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:129 +#: rhodecode/model/pull_request.py:128 msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "Richiesta PULL chiusa. Merge effettuato." - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 +#: rhodecode/model/pull_request.py:1166 msgid "Server-side pull request merging is disabled." msgstr "L'Incorporamento lato server delle richiesta di PULL è disabilitato" -#: rhodecode/model/pull_request.py:1154 +#: rhodecode/model/pull_request.py:1168 msgid "This pull request is closed." msgstr "Questa richiesta PULL è chiusa." -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "L'incorporamento delle richieste PULL non è supportato." -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "Il supporto ai file di grosse dimensioni sul repository target è disabilitato." -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "Sul repository sorgente, il supporto a file di grosse dimensioni è disabilitato." -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "Segnalibri" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "Commit IDs" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "Branch chiusi" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "Approvazione della richiesta PULL in attesa." -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "ultimo consiglio" @@ -3639,32 +3757,32 @@ msgstr "ultimo consiglio" msgid "You can't Edit this user since it's crucial for entire application" msgstr "Utente critico per l'intera applicazione. Editing disabilitato." -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "Non puoi editare questo utente (`%(username)s`) poiché è cruciale per l'intera applicazione" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 msgid "You can't remove this user since it's crucial for entire application" msgstr "Utente critico per l'intera applicazione. Eliminazione disabilitata." -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "L'utente \"%s\" è ancora proprietario di %s repository e non può' essere rimosso. Sostituire i proprietari o rimuovere quei repository: %s" -#: rhodecode/model/user.py:519 +#: rhodecode/model/user.py:523 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "L'utente \"%s\" è ancora proprietario del/dei %s gruppi di repositor y e non può essere rimosso. Sostituire il proprietario o rimuovere quel/quei gruppi di repository: %s" -#: rhodecode/model/user.py:528 +#: rhodecode/model/user.py:532 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3716,8 +3834,8 @@ msgstr "Nome del gruppo non valido" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "Un gruppo col nome \"%(usergroup)s\" esiste già" +msgid "User group `%(usergroup)s` already exists" +msgstr "" #: rhodecode/model/validators.py:226 msgid "" @@ -3963,27 +4081,27 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "" "You do not have the permission to store repository groups in the root " "location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4023,440 +4141,454 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "Nessun risultato" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "Nessuna corrispondenza" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Inoltro..." -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "Caricamento ..." -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Nessuna corrispondenza tra i file" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Collegamento selezione" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Smetti di seguire il repository" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Smetti di seguire" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Inizia a seguire il repository" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Segui" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "Mostra ancora" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" @@ -4469,7 +4601,7 @@ msgstr "Aggiungi un altro commento" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" @@ -4477,141 +4609,159 @@ msgstr "" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this " +"page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No branches available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No gists available yet." +msgid "No bookmarks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" -msgstr "Apri una richiesta PULL" +msgid "No user groups available yet." +msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 +msgid "Open new pull request" +msgstr "Apri una richiesta PULL" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "Invia" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 msgid "" "There are currently no open pull requests requiring your participation." msgstr "Al momento non ci sono richieste di PULL che richiedono il tuo intervento" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "disabilitato" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "abilitato" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "i file" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" msgstr "" @@ -4647,13 +4797,14 @@ msgstr "Dashboard" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "filtro rapido..." @@ -4685,19 +4836,19 @@ msgid "Edit Repository Group" msgstr "Modifica il Gruppo di Repository" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4707,12 +4858,15 @@ msgid "Name" msgstr "Nome" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4720,13 +4874,15 @@ msgstr "Nome" #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4734,48 +4890,51 @@ msgstr "Nome" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "Descrizione" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "Ultimo cambiamento" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "Proprietario" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "Ultimo cambiamento" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4792,7 +4951,7 @@ msgid "Home" msgstr "Base" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Autenticati" @@ -4906,6 +5065,70 @@ msgstr "L'attivazione dell'account richi msgid "Create Account" msgstr "" +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "Data" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "Azione" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "Repository" + #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 msgid "Admin audit logs" @@ -4916,68 +5139,34 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "filtro" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "Query di esempio" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:68 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "Azione" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "Repository" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "Data" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" msgstr "Nessuna azione" @@ -5015,13 +5204,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -5049,21 +5238,21 @@ msgstr "Impostazioni base per nuovi repo #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 -#: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Tipo" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" msgstr "Repository privato" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -5118,7 +5307,7 @@ msgstr "Livello di accesso ai Gist" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "testo semplice" @@ -5129,15 +5318,15 @@ msgstr "Aggiorna il Gist" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "Annulla" -#: rhodecode/templates/admin/gists/edit.mako:122 +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " @@ -5170,7 +5359,7 @@ msgid "All Public Gists" msgstr "Tutti i Gist pubblici" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" msgstr "Crea un Nuovo Gist" @@ -5195,14 +5384,14 @@ msgid "My public" msgstr "Mio Pubblico" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5211,6 +5400,7 @@ msgid "Author" msgstr "Autore" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5219,7 +5409,7 @@ msgid "Created on" msgstr "Creato il" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "Scade" @@ -5253,44 +5443,33 @@ msgstr "Crea un Gist Pubblico" msgid "Gist" msgstr "Gist" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" msgstr "Conferma di voler eliminare questo Gist" -#: rhodecode/templates/admin/gists/show.mako:56 -#: rhodecode/templates/admin/integrations/list.mako:204 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:60 -#: rhodecode/templates/data_table/_dt_elements.mako:118 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#: rhodecode/templates/data_table/_dt_elements.mako:193 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "Modifica" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "Mostra sorgente" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "Gist Privato" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "creato" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "Mostra sorgente" @@ -5303,7 +5482,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "Gruppi di Repository" @@ -5316,7 +5495,7 @@ msgstr "Gruppi di Repository" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 #: rhodecode/templates/base/base.mako:84 -#: rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Impostazioni" @@ -5338,67 +5517,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "Tutto" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "Azioni" -#: rhodecode/templates/admin/integrations/list.mako:115 +#: rhodecode/templates/admin/integrations/list.mako:119 msgid "No {type} integrations for repo {repo} exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:117 +#: rhodecode/templates/admin/integrations/list.mako:121 msgid "No {type} integrations for repogroup {repogroup} exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:119 +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5414,12 +5593,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "il mio Account" @@ -5438,26 +5617,35 @@ msgstr "Profilo" msgid "Auth Tokens" msgstr "Tocken autorizzativi" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "le Email" -#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/my_account/my_account.mako:40 msgid "Watched" msgstr "Osservato" -#: rhodecode/templates/admin/my_account/my_account.mako:40 -#: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:241 +#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 msgid "Pull Requests" msgstr "Richieste 'Pull'" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5466,7 +5654,7 @@ msgstr "Richieste 'Pull'" msgid "Permissions" msgstr "Permessi" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5516,16 +5704,23 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "Aggiungi" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5617,11 +5812,11 @@ msgstr "Mostra richieste di PULL chiuse. msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5630,7 +5825,7 @@ msgstr "" msgid "Title" msgstr "Titolo" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5639,40 +5834,96 @@ msgstr "" msgid "Repositories You Own" msgstr "Repository che ti appartengono" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "Creato" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "" +"SSH Keys usage is currently disabled, please ask your administrator to " +"enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "" +"Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-" +"sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "I Repository che osservi" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "Nessuna notifica" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "Mostra notifica" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "Le mie Notifiche" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 -msgid "Comments" -msgstr "Commenti" - -#: rhodecode/templates/admin/notifications/notifications.mako:37 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 msgid "Mark all as read" msgstr "Marca tutti come letti" -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "Nessuna notifica" - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "Mostra notifica" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "Notifiche" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" -msgstr "" +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 +msgid "Comments" +msgstr "Commenti" #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" @@ -5691,6 +5942,10 @@ msgid "IP Whitelist" msgstr "Whitelist IP" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "Panoramica" @@ -5731,32 +5986,45 @@ msgstr "Messaggio personalizzato che sarà mostrato nella pagina di registrazione. HTML supportato." msgid "External Authentication Account Activation" msgstr "Attivazione account ad autenticazione esterna" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "Whitelist di base di indirizzi IP per tutti gli utenti" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "Conferma eliminazione dell'ip: %s" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "Tutti gli indirizzi IP possono accedere" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "Nuovo indirizzo IP" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "Descrizione.." -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5811,6 +6079,14 @@ msgstr "Tutti i permessi di base saranno msgid "Default User Permissions Overview" msgstr "Panoramica permessi utente di default" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "Aggiungi Gruppo di Repository" @@ -5827,16 +6103,21 @@ msgstr "Gruppi di Repository" msgid "Group Name" msgstr "Nome gruppo" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "Gruppo genitore" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "Copia i permessi del gruppo genitore" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "Copia i parametri dei permessi dal gruppo repository genitore" @@ -5852,7 +6133,7 @@ msgstr "Aggiungi Gruppo Figlio" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "Avanzate" @@ -5881,20 +6162,6 @@ msgstr "Gruppo di Repository: %s" msgid "Delete repository group" msgstr "Elimina il gruppo di repository" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "Questo gruppo di repository include all'interno %s altro gruppo di repository" -msgstr[1] "Questo gruppo di repository include all'interno %s altri gruppo di repository" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "Questo gruppo di repository include all'interno %s altro repository" -msgstr[1] "Questo gruppo di repository include all'interno %s altri repository" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" @@ -5904,64 +6171,64 @@ msgstr "Conferma la cancellazione di que msgid "Delete this repository group" msgstr "Elimina questo gruppo di repository" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "Permessi del Gruppo di Repository" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "Utente/Utente Gruppo" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "super admin" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "proprietario" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "Revoca" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "admin delegato" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "Aggiungi nuovo" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "Applica ai figli" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "Entrambi" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." @@ -5972,19 +6239,23 @@ msgstr "Se spuntato, imposta o revoca i msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "Cambia il proprietario al gruppo di repository" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "Gruppo genitore" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "Cambia il proprietario al gruppo di repository" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "Abilita il Blocco del repository" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " @@ -5999,7 +6270,7 @@ msgstr "Amministrazione Gruppi di Reposi msgid "repository groups" msgstr "gruppi di repository" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "Numero di repository livello top" @@ -6016,52 +6287,52 @@ msgstr "Importare un repository esistent msgid "Clone from" msgstr "Clona da" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." -msgstr "Mantenersi concisi e dritti al punto. Usare un file README per descrizioni più verbose" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "" +"Plain text format with support of {metatags}. Add a README file for longer " +"descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "Gruppo di Repository" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "Seleziona il mio gruppo personale (%(repo_group_name)s)" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "Seleziona, opzionalmente, un gruppo in cui porre questo repository" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:79 -msgid "Set the type of repository to create." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" -msgstr "%s Creazione repository" +msgid "{} Creating repository" +msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 msgid "Creating repository" @@ -6092,7 +6363,7 @@ msgid "Remote" msgstr "Remoto" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "Statistiche" @@ -6201,7 +6472,7 @@ msgid "Delete forks" msgstr "Cancella i fork" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Conferma la cancellazione del repository: %s" @@ -6226,6 +6497,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6264,7 +6544,7 @@ msgstr "Chiave" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 @@ -6452,8 +6732,8 @@ msgid "" msgstr "In caso il repository sia rinominato o spostato in un altro gruppo l'URL cambierebbe.\nUsare l'indirizzo sopra riportato, garantisce che questo repository sarà sempre accessibile da quell'URL.\nUtile per i sistemi CI, o ogni altro caso in cui si necessiti di cablare l'URL in servizi di terze parti" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "Gruppo di Repository" @@ -6471,9 +6751,9 @@ msgid "Remote uri" msgstr "URI remoto" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "modifica" @@ -6508,32 +6788,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "Cambia il proprietario del repository" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "Repository privato" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "Abilita statistiche" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "Abilita la finestra delle statistiche sulla pagina di riepilogo" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "Abilita i download" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "Abilita il menù per il download sulla pagina di riepilogo" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "Abilita il blocco automatico" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -6628,7 +6908,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "Salve impostazioni" @@ -6728,7 +7008,7 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6913,6 +7193,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "Controllo nuove versioni..." + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6970,10 +7259,6 @@ msgid "" "custom size" msgstr "Ultimi %(size)s bytes per i log di processo, usa il parametro ?offset=[num] GET per cambiare la dimensione" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "Controllo nuove versioni..." - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7042,97 +7327,97 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:66 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." -msgstr "Riconosce dei meta tag all'interno dei testi nel repository e li converte in tag colorati." - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +"Parses meta tags from repository or repository group description fields and " +"turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "" "Number of items displayed in the main page dashboard before pagination is " "shown." msgstr "Numero di elementi mostrati nella pagina princiaple della dashboard prima dei controlli di paginazione" -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" msgstr "Elementi pagine Admin" -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "Numero di elementi mostrati nelle griglie delle pagine dell'amministratore." -#: rhodecode/templates/admin/settings/settings_visual.mako:117 +#: rhodecode/templates/admin/settings/settings_visual.mako:106 msgid "Commit ID Style" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:121 +#: rhodecode/templates/admin/settings/settings_visual.mako:110 msgid "Commit sha length" msgstr "Lunghezza SHA del commit" -#: rhodecode/templates/admin/settings/settings_visual.mako:128 +#: rhodecode/templates/admin/settings/settings_visual.mako:117 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "Mostra il num. di rev. del commit" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "Icone" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "Mostra l'icona \"pubblico\" dei repository" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "Mostra l'icona 'privato' dei repository" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "Mostra le icone 'pubblico/privato' accanto ai nomi dei repository" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "" "Default renderer used to render comments, pull request descriptions and " "other description elements. After change old entries will still work " "correctly." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -7142,11 +7427,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7187,17 +7472,17 @@ msgid "%s user group settings" msgstr "Impostazioni del gruppo utente %s" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "Permessi globali" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "Riepilogo dei permessi" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "Membri" @@ -7214,54 +7499,59 @@ msgstr "Assegnati ai repository" msgid "Assigned to repo groups" msgstr "Assegnati ai gruppi di repository" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "Gruppo utente: %s" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 -msgid "This group is set to be automatically synchronised." -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 +msgid "This group is set to be automatically synchronised." +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "" "Users will be added or removed from this group when they authenticate with " "RhodeCode system, based on LDAP group membership. This requires `LDAP+User " "group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, python-format msgid "" "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "Conferma l'eliminazione del gruppo utente `%(ugroup)s` con tutti i permessi assegnati" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "" @@ -7295,7 +7585,7 @@ msgstr "Amministrazione gruppi utente" msgid "user groups" msgstr "gruppi utente" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7335,7 +7625,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7366,16 +7656,12 @@ msgstr "" msgid "Auth tokens" msgstr "Token autorizzativi" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "User Groups Management" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" +msgid "User Groups Management" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 @@ -7389,107 +7675,91 @@ msgstr "Ultimo login" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "Ultima attivit" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "Membro di gruppi utente" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "Forza il cambiamento password" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "Utente: %s" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "" "When this is enabled user will have to change they password when they next " "use RhodeCode system. This will also forbid vcs operations until someone " "makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 msgid "Users personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "Crea un gruppo di repository personale" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "Distacca i repository" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "Cancella i repository" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "Distacca i gruppi di repository" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "Distacca i gruppi utente" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "Conferma l'eliminazione dell'utente: %s" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "Cancella l'utente" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "" "When selecting the detach option, the depending objects owned by this user " @@ -7501,10 +7771,6 @@ msgstr "Quando l'opzione di \"distacco\" viene selezionata, gli oggetti dipendenti dell'utente saranno assegnati al `%s` super admin del sistema. L'opzione \"Ellimina\" cancellerà i repository dell'utente!" msgid "User Audit Logs" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 -msgid "audit filter..." -msgstr "" - #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" @@ -7523,10 +7789,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7583,6 +7845,29 @@ msgstr "Lingua" msgid "Help translate %(rc_link)s into your language." msgstr "Aiuta a tradurre %(rc_link)s nella tua lingua." +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "" +"Below is a 2048 bit generated SSH RSA key. You can use it to access " +"RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" msgstr "Amministrazione utenti" @@ -7624,141 +7909,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: rhodecode/templates/base/base.mako:228 -#: rhodecode/templates/data_table/_dt_elements.mako:12 -#: rhodecode/templates/data_table/_dt_elements.mako:13 -#: rhodecode/templates/data_table/_dt_elements.mako:153 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "Riassunto" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "Registro" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "i File" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Confronta" -#: rhodecode/templates/base/base.mako:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostra le richieste PULL da %s" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "Opzioni" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "Confronta FORK" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "Confronta fork con %s" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Ricerca" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "Sblocca" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "Blocca" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "Fork" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "Crea richiesta di PULL" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "Accedi" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "Accedi al tuo account" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "(Password dimenticata?)" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "Non possiedi un account?" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "Journal" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "Journal" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:400 msgid "Public journal" msgstr "Journal pubblico" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:405 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:401 +#: rhodecode/templates/base/base.mako:406 msgid "Gists" msgstr "i Gist" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7780,15 +8065,15 @@ msgstr "" msgid "Style" msgstr "Stile" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "Scorciatoie da tastiera" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "Scorciatoie per tutto il sito" @@ -7898,9 +8183,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "Anteprima" @@ -7908,77 +8193,94 @@ msgstr "Anteprima" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "mostra" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "nessuno" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "lettura" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "scrittura" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "admin" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "Permesso" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "Modifica Permesso" -#: rhodecode/templates/base/perms_summary.mako:85 -msgid "Super admin" -msgstr "Super admi" - -#: rhodecode/templates/base/perms_summary.mako:87 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 msgid "Repository default permission" msgstr "Permessi base del repository" -#: rhodecode/templates/base/perms_summary.mako:88 +#: rhodecode/templates/base/perms_summary.mako:120 msgid "Repository group default permission" msgstr "Permessi base del gruppo di repository" -#: rhodecode/templates/base/perms_summary.mako:89 +#: rhodecode/templates/base/perms_summary.mako:123 msgid "User group default permission" msgstr "Permessi base del gruppo utente" -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:126 +msgid "Super admin" +msgstr "Super admi" + +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "Crea i repository" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "Fork di repository" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "Crea gruppi di repository" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "Crea gruppi utente" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "Nessun permesso definito" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8101,93 +8403,74 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "" -"These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "" -"Use rebase instead of creating a merge commit when merging via web " -"interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "Proxy per le richieste HTTP Subversion" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "" "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "URL del server HTTP Subversion" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "Pattern del Repository" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "\"Pattern\" per identificare \"branch\" e \"tag\" svn. Per ricerche ricorsive, usare \"*\". Es.: \"/branches/*\"" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "Abilita l'incorporamento lato server delle \"richieste di PULL\"" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -8195,16 +8478,40 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "Invalida e realloca i commenti in linea durante l'aggiornmento" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." msgstr "Aggiorna la posizione dei commenti inline durante l'aggiornamento di una \"richiesta di PULL\". I commenti inline non più sognificativi saranno nascosti." +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "" +"Use rebase instead of creating a merge commit when merging via web " +"interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "" +"Close branch before merging it into destination branch. No effect when " +"rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -8219,8 +8526,8 @@ msgid "Compare Selected Bookmarks" msgstr "confronta i Segnalibri Selezionati" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -8241,8 +8548,8 @@ msgid "Compare Selected Branches" msgstr "confronta i Branch Selezionati" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -8254,55 +8561,54 @@ msgstr "Branch %s" msgid "%s Changelog" msgstr "%s Changelog" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "Confronta fork con %s" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "Ripulisci selezione" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "Messaggio Commit" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "Et" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "Filtra registro" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "Nessun cambiamento" @@ -8320,8 +8626,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8334,43 +8639,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "Espandi il messaggio commit" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "merge" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8378,7 +8688,7 @@ msgstr "merge" msgid "Tag %s" msgstr "Tag %s" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8391,102 +8701,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 +#: rhodecode/templates/changeset/changeset.mako:142 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "diff semplice" -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:143 msgid "Raw Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:143 +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "Patch diff" -#: rhodecode/templates/changeset/changeset.mako:144 +#: rhodecode/templates/changeset/changeset.mako:147 msgid "Patch Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:147 +#: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "Download diff" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8556,12 +8848,12 @@ msgid "Leave a comment on this Commit." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Autenticati ora" @@ -8581,7 +8873,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Chiuso" @@ -8599,15 +8891,8 @@ msgstr "Commento" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "(%s commit)" -msgstr[1] "(%s commit)" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8619,31 +8904,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "Mostra confronto combinato" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8651,8 +8918,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -8660,8 +8927,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" msgstr "Mostra diff completo" @@ -8674,68 +8941,50 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "" -"%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:118 +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "Nessun file" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "" +"This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "" -"This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:415 #: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format @@ -8794,7 +9043,7 @@ msgstr "" msgid "Wide Mode Diff" msgstr "" -#: rhodecode/templates/codeblocks/source.mako:24 +#: rhodecode/templates/codeblocks/source.mako:25 msgid "view annotation from before this change" msgstr "" @@ -8807,25 +9056,11 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" msgstr "" @@ -8835,13 +9070,6 @@ msgstr "" msgid "%s Compare" msgstr "%s Confronti" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "%s commit" -msgstr[1] "%s commit" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 @@ -8855,14 +9083,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "" @@ -8886,72 +9114,69 @@ msgstr "Scambia" msgid "Compare commits, branches, bookmarks or tags." msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:49 +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "Repository Mercurial" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "Repository Git" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" msgstr "Repositiory subversion" -#: rhodecode/templates/data_table/_dt_elements.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "Repository pubblico" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "Creazione repository in corso..." - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "Sottoscrivi il feed rss %s" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "Sottoscrivi l' atom feed %s" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" msgstr "Creazione" -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "Creato" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, 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] "Conferma l'eliminazione del gruppo: %s incluso %s repository" -msgstr[1] "Conferma l'eliminazione del gruppo: %s inclusi %s repository" - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Conferma la cancellazione di questo gruppo utente: %s" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "Gruppo utenti" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "Privato" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" @@ -9253,13 +9478,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -9275,13 +9493,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9317,13 +9528,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9391,22 +9595,22 @@ msgid "Create New File" msgstr "Crea Nuovo File" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "accapo automatico" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "acceso" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "spento" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "Commit modifiche" @@ -9461,15 +9665,15 @@ msgid "Delete file" msgstr "Elimina file" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "File binario (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" -msgstr "Il file è troppo grande per essere mostrato" +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " +msgstr "" #: rhodecode/templates/files/files_delete.mako:70 msgid "Delete File" @@ -9518,15 +9722,15 @@ msgstr "sorgente" msgid "annotation" msgstr "annotazione" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "raw" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" msgstr "download" -#: rhodecode/templates/files/files_edit.mako:74 +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "Modifica file" @@ -9534,62 +9738,55 @@ msgstr "Modifica file" msgid "Location" msgstr "Ubicazione" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 -msgid "Annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 -msgid "Raw" -msgstr "" - #: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 +msgid "Annotation" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 +msgid "Raw" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Download" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "Impossibile modificare file binari" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9603,22 +9800,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "nome Fork" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "Copia permessi" -#: rhodecode/templates/forks/fork.mako:97 +#: rhodecode/templates/forks/fork.mako:102 msgid "Copy permissions from forked repository" msgstr "Copia permessi dal fork del repository" -#: rhodecode/templates/forks/fork.mako:102 +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "Fai un Fork del repository" @@ -9631,34 +9829,23 @@ msgstr "%s Fork" msgid "Forks" msgstr "i Fork" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "è un Fork" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "Non ci sono Fork" - -#: rhodecode/templates/journal/journal.mako:13 +#: rhodecode/templates/journal/journal.mako:14 msgid "Filter" msgstr "" -#: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "%s elemento" -msgstr[1] "%s elementi" - -#: rhodecode/templates/journal/journal.mako:23 +#: rhodecode/templates/journal/journal.mako:24 msgid "ATOM journal feed" msgstr "Feed ATOM del journal" -#: rhodecode/templates/journal/journal.mako:24 +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "Feed RSS del journal" @@ -9667,15 +9854,15 @@ msgid "No entries yet" msgstr "Nessuna entry" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "Journal Pubblico" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "Feed ATOM del journal pubblico" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "Feed RSS del journal pubblico" @@ -9705,22 +9892,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "Revisori della richiesta PULL" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9733,13 +9920,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9764,26 +9944,26 @@ msgstr "" msgid "Merge is not currently possible because of below failed checks." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9804,171 +9984,175 @@ msgstr "Conferma l'eliminazione di quest msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 -#, python-format -msgid "calculated based on %s reviewer vote" -msgid_plural "calculated based on %s reviewers votes" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 -msgid "{} version available for this pull request, show it." -msgid_plural "{} versions available for this pull request, show them." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 -#, python-format -msgid "%d General " -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "Salva i Cambiamenti" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 +msgid "Mandatory reviewer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "" "These commits cannot be displayed, because this repository uses the " "Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 msgid "" "This pull request cannot be displayed, because one or more commits no longer" " exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 msgid "" "Please update this pull request, push the commits back into the source " "repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "Aggiorna i commit" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 msgid "" "Commits and changes between v{ver_from} and {ver_to} of this pull request, " "commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -10071,7 +10255,7 @@ msgstr "" msgid "Age (old first)" msgstr "" -#: rhodecode/templates/search/search_content.mako:33 +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "" @@ -10079,84 +10263,74 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "%s Riassunto" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "%s feed ATOM" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "%s feed RSS" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 -msgid "Show by Name" -msgstr "Mostra per Nome" - -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 -msgid "Show by ID" -msgstr "Mostra per ID" - -#: rhodecode/templates/summary/components.mako:56 -msgid "SVN Protocol is disabled. To enable it, see the" -msgstr "" - #: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 +msgid "Show by Name" +msgstr "Mostra per Nome" + +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 +msgid "Show by ID" +msgstr "Mostra per ID" + +#: rhodecode/templates/summary/components.mako:61 +msgid "SVN Protocol is disabled. To enable it, see the" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "Clona url" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "Le statistiche sono state disabilitate su questo repository" -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "Non ci sono download" -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "Download disabilitati sul repository" -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" msgstr "" @@ -10174,6 +10348,21 @@ msgstr "Avvio rapido" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "%s Riassunto" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "%s feed ATOM" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "%s feed RSS" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" msgstr "" diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-27 17:25+0200\n" -"PO-Revision-Date: 2017-06-27 15:26+0000\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" +"PO-Revision-Date: 2017-11-03 15:43+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Japanese (http://www.transifex.com/rhodecode/RhodeCode/language/ja/)\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "全般" @@ -96,17 +96,86 @@ msgid "System Info" msgstr "システム情報" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" +msgid "Processes" msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" msgstr "オープンソースライセンス" -#: rhodecode/apps/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "ラボ" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "デフォルト設定の更新に成功しました" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "デフォルト値の更新中にエラーが発生しました" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "アプリケーションの権限の更新に成功しました" + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "権限の更新中にエラーが発生しました" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "オブジェクトの権限の更新に成功しました" + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "全般の権限の更新に成功しました" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "編集" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "リポジトリグループ %s を作成しました" + +#: rhodecode/apps/admin/views/repo_groups.py:198 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "リポジトリグループ %s の作成中にエラーが発生しました" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "" @@ -269,272 +338,858 @@ msgstr "" msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "このユーザーは編集できません" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "無期限" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "5 分" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "1 時間" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "1 日" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "1 ヶ月" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "有効期間" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "ユーザーグループ %(user_group_link)s を作成しました" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "ユーザーグループ %s の作成中にエラーが発生しました" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "ユーザー %(user_link)s を作成しました" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "ユーザー %s の作成中にエラーが発生しました" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "ユーザーの更新に成功しました" + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "ユーザー %s の更新中にエラーが発生しました" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "%s 個のリポジトリを切り離しました" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr " %s 個のリポジトリを削除しました" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "%s 個のリポジトリグループを切り離しました" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "%s 個のリポジトリグループを削除しました" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "%s 個のユーザーグループを切り離しました" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "%s 個のユーザーグループを削除しました" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "ユーザーの削除に成功しました" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "ユーザーの削除中にエラーが発生しました" + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "ユーザーの全般の権限の更新に成功しました" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "権限の保存時にエラーが発生しました" + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "パスワード変更強制を無効化しました" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "パスワード変更強制を有効化しました" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "パスワードのリセット中にエラーが発生しました" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "リポジトリグループ `%s` を作成しました" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "ユーザーのリポジトリグループを作成中にエラーが発生しました" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "ロール" -#: rhodecode/apps/admin/views/users.py:217 -#: rhodecode/apps/my_account/views.py:191 +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" msgstr "認証トークンの作成に成功しました" -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" msgstr "認証トークンの削除に成功しました" -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "ユーザーアカウントに新しいメールアドレス `%s` を追加しました" -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" msgstr "ユーザーアカウントからメールアドレスを削除しました" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "IP アドレスの保存中にエラーが発生しました: %s" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" msgstr "IPアドレスの保存中にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:393 +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "ユーザーホワイトリストに IP アドレス %s を追加しました" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "無期限" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "5 分" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "1 時間" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "1 日" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "1 ヶ月" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "有効期間" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "登録されたアカウントが必要です" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "匿名ユーザによるアクセスが可能です" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "gist の作成中にエラーが発生しました" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "gist %s を削除しました" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/data_table/_dt_elements.mako:323 +msgid "never" +msgstr "無し" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "%(expiry)s - 現在値" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "Gist の内容を更新しました" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "Gist データを更新しました" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "Gist {} の更新中にエラーが発生しました: {}" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "Gist %s の更新中にエラーが発生しました" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 #: rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "リポジトリ" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "グループ" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "%(repo)s のコミット" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "公開ジャーナル" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "ジャーナル" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:279 +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" msgstr "RhodeCode に登録されました" -#: rhodecode/apps/login/views.py:315 +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:321 +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:410 +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "パスワードリセットが成功しました、新しいパスワードをあなたのメールアドレスに送信しました" -#: rhodecode/apps/my_account/views.py:125 +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" msgstr "ユーザーパスワードの更新中にエラーが発生しました" -#: rhodecode/apps/my_account/views.py:132 +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" msgstr "パスワードの更新に成功しました" -#: rhodecode/apps/my_account/views.py:281 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:70 +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "アカウントの更新に成功しました" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "リポジトリグループ %s の削除中にエラーが発生しました" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "自分自身の管理者の権限を変更できません" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "リポジトリグループ権限を更新しました" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "リポジトリグループ %s の更新中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" msgstr "キャッシュの無効化に成功しました" -#: rhodecode/apps/repository/views/repo_caches.py:74 +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化中にエラーが発生しました" -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "まだコミットがありません" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "リポジトリにそのようなコミットはありません" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "リポジトリ %s を %s から作成しました" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "リポジトリ %s を %s としてフォークしました" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "リポジトリ %s を作成しました" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "空白文字を表示" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "すべての差分で空白文字を表示" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "空白文字を無視" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "すべての差分で空白文字を無視" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "差分の範囲を拡大" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "すべての差分で範囲を拡大" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "状態変更 %(transition_icon)s %(status)s" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "" +"Changing the status of a commit associated with a closed pull request is not" +" allowed" +msgstr "終了したプルリクエストに関連するコミットは状態変更できません" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "コミット選択" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "種類が異なるリモートリポジトリの比較はできません。" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "ラージファイル設定が異なるリポジトリの比較はできません" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "" +"Repositories unrelated. Cannot compare commit %(commit1)s from repository " +"%(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "リポジトリに関連がありません。リポジトリ %(repo1)s のコミット %(commit1)s とリポジトリ %(repo2)s のコミット %(commit2)s を比較できません。" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "%s リポジトリでの変更" + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "%s %s フィード" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "このリポジトリは %s on %s によりロックされています" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "ファイルを追加するにはここをクリックしてください。" + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "まだファイルがありません。 %s" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "ダウンロードは無効化されています" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "空のリポジトリ" + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "未知のアーカイブ種別です" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "チェンジセット" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "ブランチ" + +#: rhodecode/apps/repository/views/repo_files.py:890 +#: rhodecode/model/scm.py:791 rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "タグ" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "コミット中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "変更点なし" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "RhodeCode Enterprise 経由でファイルを追加しました" + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "ファイル名がありません" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "" +"The location specified must be a relative path and must not contain .. in " +"the path" +msgstr "場所の指定は相対かつ .. を含まないパスでなければなりません" + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "フォークを比較" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "リポジトリ %s のフォーク中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" msgstr "リポジトリ権限を更新しました" +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "コミットが存在しません" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +msgid "Pull request requires a title with min. 3 chars" +msgstr "プルリクエストには3文字以上のタイトルが必要です" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "プルリクエスト作成エラー: {}" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "新しいプルリクエストの作成に成功しました" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "終了したプルリクエストは更新できません" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "プルリクエストのタイトルと説明を更新しました。" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "" +"Pull request updated to \"{source_commit_id}\" with {count_added} added, " +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "プルリクエストはマージに成功し終了しました。" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "プルリクエストの削除に成功しました" + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" +msgstr "" + #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "アンロック" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "ロック" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "リポジトリは %s されています" + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "アンロック中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "リポジトリステートの削除中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "%s 個のフォークを切り離しました" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "%s 個のフォークを削除しました" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "" "Cannot delete `{repo}` it still contains attached forks. Try using " "{delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "公開ジャーナルでのリポジトリの可視性を更新しました" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 msgid "An error occurred during setting this repository in public journal" msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "ありません" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとする" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" msgstr "リポジトリをロックしました" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" msgstr "リポジトリのロックを解除しました" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "アンロック中にエラーが発生しました" - -#: rhodecode/apps/repository/views/repo_summary.py:293 +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "フィールドの作成中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "フィールドの削除中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "問題追跡システムのエントリの削除中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "問題追跡システムのエントリを削除しました" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "問題追跡システムのエントリを更新しました" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "リモートから取得" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "リモートから取得中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "フォーム入力に無効なデータが含まれています" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "VCS設定を更新しました" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "リポジトリのVCS設定を更新中にエラーが発生しました" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" msgstr "ブランチ" -#: rhodecode/apps/repository/views/repo_summary.py:294 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" msgstr "タグ" -#: rhodecode/apps/repository/views/repo_summary.py:295 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" msgstr "ブックマーク" -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "ブランチ" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" msgstr "閉鎖済みブランチ" +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "ユーザーグループ %s を更新しました" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "ユーザーグループ %s の更新中にエラーが発生しました" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "ユーザーグループの削除に成功しました" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "ユーザーグループの削除中にエラーが発生しました" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "対象に同じ物を選ぶことはできません" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "ユーザーグループ権限を更新しました" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "ユーザーグループの全般の権限の更新に成功しました" + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" msgstr "" #: rhodecode/authentication/schema.py:35 @@ -542,21 +1197,21 @@ msgid "Enable or disable this authentica msgstr "この認証プラグインを有効化します。" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" msgstr "有効" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication responsecall for this plugin. \n" -"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:49 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" msgstr "認証キャッシュ有効期間" @@ -565,15 +1220,15 @@ msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "プラグインの設定保存時にエラーが発生しました。フォームの入力を確認してください。" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." msgstr "認証設定の更新に成功しました。" -#: rhodecode/authentication/views.py:177 +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "プラグインの設定保存時にエラーが発生しました。フォームの入力を確認してください。" -#: rhodecode/authentication/views.py:187 +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." msgstr "認証設定の更新時にエラーが発生しました。" @@ -660,7 +1315,6 @@ msgid "The url of the Jasig CAS REST ser msgstr "Jasig CAS RESTサービスのURL" #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "URL" @@ -699,10 +1353,11 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "パスワード" @@ -793,7 +1448,7 @@ msgstr "" msgid "Email Attribute" msgstr "メール属性" -#: rhodecode/authentication/plugins/auth_ldap.py:365 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" msgstr "LDAP" @@ -826,474 +1481,6 @@ msgstr "Rhodecode" msgid "Rhodecode Token Auth" msgstr "Rhodecodeトークン認証" -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "まだコミットがありません" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "空白文字を表示" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "すべての差分で空白文字を表示" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "空白文字を無視" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "すべての差分で空白文字を無視" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "差分の範囲を拡大" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "すべての差分で範囲を拡大" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "リポジトリにそのようなコミットはありません" - -#: rhodecode/controllers/changeset.py:343 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "状態変更 %(transition_icon)s %(status)s" - -#: rhodecode/controllers/changeset.py:387 -msgid "" -"Changing the status of a commit associated with a closed pull request is not" -" allowed" -msgstr "終了したプルリクエストに関連するコミットは状態変更できません" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "コミット選択" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "種類が異なるリモートリポジトリの比較はできません。" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "ラージファイル設定が異なるリポジトリの比較はできません" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "" -"Repositories unrelated. Cannot compare commit %(commit1)s from repository " -"%(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "リポジトリに関連がありません。リポジトリ %(repo1)s のコミット %(commit1)s とリポジトリ %(repo2)s のコミット %(commit2)s を比較できません。" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "%s リポジトリでの変更" - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "%s %s フィード" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "ファイルを追加するにはここをクリックしてください。" - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "まだファイルがありません。 %s" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "このリポジトリは %s on %s によりロックされています" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "コミット中にエラーが発生しました" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -msgid "You can only edit files with revision being a valid branch " -msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます。" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "変更点なし" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "RhodeCode Enterprise 経由でファイルを追加しました" - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "ファイル名がありません" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "" -"The location specified must be a relative path and must not contain .. in " -"the path" -msgstr "場所の指定は相対かつ .. を含まないパスでなければなりません" - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "ダウンロードは無効化されています" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "%s は未知のリビジョンです" - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "空のリポジトリ" - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "未知のアーカイブ種別です" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "チェンジセット" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "タグ" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "リポジトリ %s のフォーク中にエラーが発生しました" - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "公開ジャーナル" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "ジャーナル" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "コミットが存在しません" - -#: rhodecode/controllers/pullrequests.py:216 -msgid "Pull request requires a title with min. 3 chars" -msgstr "プルリクエストには3文字以上のタイトルが必要です" - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "プルリクエスト作成エラー: {}" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "新しいプルリクエストの作成に成功しました" - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "終了したプルリクエストは更新できません" - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "プルリクエストのタイトルと説明を更新しました。" - -#: rhodecode/controllers/pullrequests.py:346 -msgid "" -"Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "プルリクエストはマージに成功し終了しました。" - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "プルリクエストの削除に成功しました" - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "デフォルト設定の更新に成功しました" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "デフォルト値の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "登録されたアカウントが必要です" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "匿名ユーザによるアクセスが可能です" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "gist の作成中にエラーが発生しました" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "gist %s を削除しました" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "Gist の内容を更新しました" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "Gist データを更新しました" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "Gist {} の更新中にエラーが発生しました: {}" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "Gist %s の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -msgid "never" -msgstr "無し" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "%(expiry)s - 現在値" - -#: rhodecode/controllers/admin/my_account.py:70 -msgid "You can't edit this user since it's crucial for entire application" -msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "アカウントの更新に成功しました" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "ユーザー %s の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "アプリケーションの権限の更新に成功しました" - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "権限の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "オブジェクトの権限の更新に成功しました" - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "全般の権限の更新に成功しました" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "リポジトリグループ %s を作成しました" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "リポジトリグループ %s の作成中にエラーが発生しました" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "リポジトリグループ %s を更新しました" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, python-format -msgid "Error occurred during update of repository group %s" -msgstr "リポジトリグループ %s の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "このグループは %(num)d 個のリポジトリを含んでいるため削除できません" - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "このグループは %(num)d のサブグループを含んでいるため削除できません" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "リポジトリグループ %s を削除しました" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, python-format -msgid "Error occurred during deletion of repository group %s" -msgstr "リポジトリグループ %s の削除中にエラーが発生しました" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "自分自身の管理者の権限を変更できません" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "リポジトリグループ権限を更新しました" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "リポジトリ %s 作成中にエラーが発生しました: 無効な証明書です" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "リポジトリ %s の作成中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "リポジトリ %s を %s から作成しました" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "リポジトリ %s を %s としてフォークしました" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "リポジトリ %s を作成しました" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "フィールドの作成中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "フィールドの削除中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "アンロック" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "ロック" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "リポジトリは %s されています" - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "リモートから取得" - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "リモートから取得中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "リポジトリステートの削除中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "問題追跡システムのエントリの削除中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "問題追跡システムのエントリを削除しました" - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "問題追跡システムのエントリを更新しました" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "フォーム入力に無効なデータが含まれています" - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "リポジトリのVCS設定を更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "VCS設定を更新しました" - #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" @@ -1344,205 +1531,59 @@ msgstr "ラボ設定の更新中にエラーが発生しました" msgid "Updated Labs settings" msgstr "ラボ設定を更新しました" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "ユーザーグループ %(user_group_link)s を作成しました" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "ユーザーグループ %s の作成中にエラーが発生しました" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "ユーザーグループ %s を更新しました" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "ユーザーグループ %s の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "ユーザーグループの削除に成功しました" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "ユーザーグループの削除中にエラーが発生しました" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "対象に同じ物を選ぶことはできません" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "ユーザーグループ権限を更新しました" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "ユーザーグループの全般の権限の更新に成功しました" - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "権限の保存時にエラーが発生しました" - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "ユーザー %(user_link)s を作成しました" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "ユーザー %s の作成中にエラーが発生しました" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "ユーザーの更新に成功しました" - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "%s 個のリポジトリを切り離しました" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr " %s 個のリポジトリを削除しました" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "%s 個のリポジトリグループを切り離しました" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "%s 個のリポジトリグループを削除しました" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "%s 個のユーザーグループを切り離しました" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "%s 個のユーザーグループを削除しました" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "ユーザーの削除に成功しました" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "ユーザーの削除中にエラーが発生しました" - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "パスワード変更強制を無効化しました" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "パスワード変更強制を有効化しました" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "パスワードのリセット中にエラーが発生しました" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "リポジトリグループ `%s` を作成しました" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "ユーザーのリポジトリグループを作成中にエラーが発生しました" - -#: rhodecode/controllers/admin/users.py:396 -msgid "" -"The user participates as reviewer in pull requests and cannot be deleted. " -"You can set the user to \"inactive\" instead of deleting it." -msgstr "ユーザーはレビュワーとしてプルリクエストに参加しているため削除できません。代わりに \"非アクティブ\" 状態にすることができます。" - -#: rhodecode/controllers/admin/users.py:462 -msgid "User global permissions updated successfully" -msgstr "ユーザーの全般の権限の更新に成功しました" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "プルリクエストの作成" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "プルリクエストのクローズ" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "プルリクエストのコミット更新" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "プルリクエストのレビュー変更" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "プルリクエストのマージ" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "プルリクエストのコメント" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "リポジトリの作成準備" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" msgstr "リポジトリの作成" -#: rhodecode/events/repo.py:166 +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "リポジトリの削除準備" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" msgstr "リポジトリの削除" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "リポジトリのプル準備" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "リポジトリのプル" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "リポジトリのプッシュ準備" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "リポジトリのプッシュ" @@ -1578,54 +1619,60 @@ msgstr "ユーザーの更新準備" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 -#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "リセット" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1664,28 +1711,28 @@ msgstr "インテグレーションの動作を、ルートレベルのリポジトリのみに制限する" msgid "Root repositories only" msgstr "ルートリポジトリのみ" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "{repo_name} リポジトリ" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "{repo_group_name} リポジトリグループ" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "{name} インテグレーション" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "インテグレーション {integration_name} の削除に成功しました。" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "インテグレーションの設定保存時にエラーが発生しました。フォームの入力を確認してください。" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "インテグレーション {integration_name} の更新に成功しました。" @@ -1769,17 +1816,19 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "Slack app manager でセットアップできます" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1815,132 +1864,158 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "Slack のチャンネルにリポジトリのプッシュやプルリクエストなどのイベントを送信する。" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "Webhook URL" -#: rhodecode/integrations/types/webhook.py:166 -msgid "" -"URL of the webhook to receive POST event. Following variables are allowed to" -" be used: {vars}. Some of the variables would trigger multiple calls, like " +#: rhodecode/integrations/types/webhook.py:179 +msgid "" +"URL to which Webhook should submit data. Following variables are allowed to " +"be used: {vars}. Some of the variables would trigger multiple calls, like " "${{branch}} or ${{commit_id}}. Webhook will be called as many times as " "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "シークレットトークン" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "受信したペイロードを検証する文字列。" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" -msgstr "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "" +"Optional string used to validate received payloads. It will be sent together" +" with event data in JSON" +msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "JSON イベントを webhook エンドポイントに POST する" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "Webhook" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "リポジトリからアーカイブを[ダウンロード]" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "ユーザーを[作成]" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "ユーザーグループを[作成]" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "ユーザーグループを[更新]" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "[コメント] リポジトリのコミット" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" msgstr "[マージ] プルリクエスト" -#: rhodecode/lib/action_parser.py:148 +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "[プッシュ]" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "リポジトリに[RhodeCode経由でコミット]" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "[プル]" -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "フォーク名 %s" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1951,52 +2026,42 @@ msgstr "プルリクエスト #%s" msgid "Show all combined commits %s->%s" msgstr "%s から %s までのすべてのコミットを表示" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "比較ビュー" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "と %(num)s 以上のコミット" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" msgstr "コミットが見つかりません" -#: rhodecode/lib/auth.py:1220 +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "%s に対するアクションはできません。" - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "リポジトリ %(repo_name)s が見つかりません。" - #: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "コメント" @@ -2014,20 +2079,11 @@ msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください" msgid "No changes detected" msgstr "検出された変更はありません" -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "行を選択" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr " と %s 以上" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "ファイルなし" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2047,7 +2103,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2061,54 +2117,54 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, 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内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "たったいま" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2125,24 +2181,25 @@ msgstr "たったいま" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 +#: rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "リポジトリへのアクセス権限無し" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2159,24 +2216,25 @@ msgstr "リポジトリへのアクセス権限無し" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 +#: rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "リポジトリに読込権限でアクセス" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2193,24 +2251,25 @@ msgstr "リポジトリに読込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 +#: rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "リポジトリに書込権限でアクセス" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2227,48 +2286,49 @@ msgstr "リポジトリに書込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/model/db.py:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 +#: rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "リポジトリに管理権限でアクセス" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "リポジトリグループへのアクセス権限なし" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "リポジトリグループに読込権限でアクセス" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "リポジトリグループに書込権限でアクセス" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "リポジトリグループに管理権限でアクセス" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2284,7 +2344,7 @@ msgstr "リポジトリグループに管理権限でアクセス" msgid "RhodeCode Administrator" msgstr "RhodeCode 管理者" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2301,24 +2361,25 @@ msgstr "RhodeCode 管理者" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 +#: rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "リポジトリの作成を有効にする" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2335,24 +2396,25 @@ msgstr "リポジトリの作成を有効にする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/model/db.py:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 +#: rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "リポジトリの作成を有効にする" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2369,24 +2431,25 @@ msgstr "リポジトリの作成を有効にする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 -#: rhodecode/model/db.py:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 +#: rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "リポジトリのフォークを無効にする" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2403,45 +2466,46 @@ msgstr "リポジトリのフォークを無効にする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 +#: rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "リポジトリのフォークを有効にする" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "新規登録を無効にする" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "Rhodecodeに登録した新しいユーザーを手動でアクティベートする" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベートする" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2458,24 +2522,25 @@ msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 -#: rhodecode/model/db.py:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 +#: rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "未レビュー" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2492,24 +2557,25 @@ msgstr "未レビュー" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 -#: rhodecode/model/db.py:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 +#: rhodecode/model/db.py:3325 msgid "Approved" msgstr "承認" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2526,24 +2592,25 @@ msgstr "承認" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 -#: rhodecode/model/db.py:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 +#: rhodecode/model/db.py:3326 msgid "Rejected" msgstr "却下" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2560,20 +2627,21 @@ msgstr "却下" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 -#: rhodecode/model/db.py:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 +#: rhodecode/model/db.py:3327 msgid "Under Review" msgstr "レビュー中" @@ -2591,20 +2659,21 @@ msgstr "レビュー中" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 +#: rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "リポジトリグループへのアクセス権限なし" @@ -2622,20 +2691,21 @@ msgstr "リポジトリグループへのアクセス権限なし" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 +#: rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "リポジトリグループに読込権限でアクセス" @@ -2653,20 +2723,21 @@ msgstr "リポジトリグループに読込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 +#: rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "リポジトリグループに書込権限でアクセス" @@ -2684,20 +2755,21 @@ msgstr "リポジトリグループに書込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/model/db.py:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 +#: rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "リポジトリグループに管理権限でアクセス" @@ -2714,20 +2786,21 @@ msgstr "リポジトリグループに管理権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 +#: rhodecode/model/db.py:2605 msgid "User group no access" msgstr "ユーザーグループへのアクセス権限なし" @@ -2744,20 +2817,21 @@ msgstr "ユーザーグループへのアクセス権限なし" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/model/db.py:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 +#: rhodecode/model/db.py:2606 msgid "User group read access" msgstr "ユーザーグループに読込権限でアクセス" @@ -2774,20 +2848,21 @@ msgstr "ユーザーグループに読込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 +#: rhodecode/model/db.py:2607 msgid "User group write access" msgstr "ユーザーグループに書込権限でアクセス" @@ -2804,20 +2879,21 @@ msgstr "ユーザーグループに書込権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 +#: rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "ユーザーグループに管理権限でアクセス" @@ -2834,20 +2910,21 @@ msgstr "ユーザーグループに管理権限でアクセス" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 +#: rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "リポジトリグループの作成を無効にする" @@ -2864,20 +2941,21 @@ msgstr "リポジトリグループの作成を無効にする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 +#: rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "リポジトリグループの作成を有効にする" @@ -2894,20 +2972,21 @@ msgstr "リポジトリグループの作成を有効にする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 +#: rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "ユーザーグループの作成を無効にする" @@ -2924,20 +3003,21 @@ msgstr "ユーザーグループの作成を無効にする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 +#: rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "ユーザーグループの作成を有効にする" @@ -2954,20 +3034,21 @@ msgstr "ユーザーグループの作成を有効にする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/model/db.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 +#: rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "新規登録を無効にする" @@ -2984,20 +3065,21 @@ msgstr "新規登録を無効にする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 -#: rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 +#: rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" @@ -3014,20 +3096,21 @@ msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 +#: rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" @@ -3044,20 +3127,21 @@ msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 -#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 +#: rhodecode/model/db.py:2632 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "外部アカウントを手動でアクティベートする" @@ -3074,20 +3158,21 @@ msgstr "外部アカウントを手動でアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 -#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 +#: rhodecode/model/db.py:2633 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "外部アカウントを自動でアクティベートする" @@ -3098,20 +3183,21 @@ msgstr "外部アカウントを自動でアクティベートする" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 +#: rhodecode/model/db.py:2618 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" @@ -3123,20 +3209,21 @@ msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 +#: rhodecode/model/db.py:2619 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" @@ -3145,80 +3232,75 @@ msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 +#: rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 +#: rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 -#: rhodecode/model/db.py:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "" - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 -#: rhodecode/model/db.py:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 +#: rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 -msgid "all" -msgstr "すべて" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" -msgstr "HTTP/Web インターフェース" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 +#: rhodecode/model/db.py:1099 +msgid "all" +msgstr "すべて" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 @@ -3226,9 +3308,11 @@ msgstr "HTTP/Web インターフェース" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" -msgstr "VCS (git/hg/svn プロトコル)" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 +#: rhodecode/model/db.py:1100 +msgid "http/web interface" +msgstr "HTTP/Web インターフェース" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 @@ -3236,9 +3320,11 @@ msgstr "VCS (git/hg/svn プロトコル)" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" -msgstr "API 呼び出し" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 +#: rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" +msgstr "VCS (git/hg/svn プロトコル)" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 @@ -3246,36 +3332,54 @@ msgstr "API 呼び出し" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 +#: rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "API 呼び出し" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 +#: rhodecode/model/db.py:1103 msgid "feed access" msgstr "フィードへのアクセス" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 -#: rhodecode/model/db.py:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 +#: rhodecode/model/db.py:2356 msgid "No parent" msgstr "親がありません" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 -#: rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 +#: rhodecode/model/db.py:2628 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/model/db.py:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 +#: rhodecode/model/db.py:2629 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/model/db.py:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 +#: rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3311,112 +3415,128 @@ msgstr "最後の更新" msgid "Commit index" msgstr "コミットインデックス" -#: rhodecode/model/comment.py:374 +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" +msgstr "" + +#: rhodecode/model/comment.py:375 msgid "made a comment" msgstr "コミットを作成する" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "表示する" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "ログイン名を入力してください" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "%(min)i 文字以上必要です" -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "パスワードを入力してください" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "%(min)i 文字以上必要です" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "%(user)s がコミットにコメント %(date_or_age)s" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "%(user)s がコミットにコメント %(date_or_age)s" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "%(user)s がメッセージを送信 %(date_or_age)s" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "%(user)s がメッセージを送信 %(date_or_age)s" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "%(user)s があなたにメンション %(date_or_age)s" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "%(user)s があなたにメンション %(date_or_age)s" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "%(user)s が RhodeCode に登録 %(date_or_age)s" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "%(user)s が RhodeCode に登録 %(date_or_age)s" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "%(user)s が新しいプルリクエストを作成 %(date_or_age)s" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "%(user)s が新しいプルリクエストを作成 %(date_or_age)s" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "%(user)s がプルリクエストにコメント %(date_or_age)s" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "%(user)s がプルリクエストにコメント %(date_or_age)s" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 +#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 +#: rhodecode/model/permission.py:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "なし" -#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 -#: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 +#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 +#: rhodecode/model/permission.py:81 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "読込" -#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 -#: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3424,8 +3544,8 @@ msgstr "読込" msgid "Write" msgstr "書込" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3439,7 +3559,7 @@ msgstr "書込" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3454,189 +3574,189 @@ msgstr "書込" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "管理" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "無効" -#: rhodecode/model/permission.py:86 +#: rhodecode/model/permission.py:87 msgid "Allowed with manual account activation" msgstr "手動でアカウントをアクティベートする" -#: rhodecode/model/permission.py:87 +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "自動でアカウントをアクティベートする" -#: rhodecode/model/permission.py:90 +#: rhodecode/model/permission.py:91 msgid "Allow password recovery" msgstr "" -#: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" -msgstr "" - #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "このプルリクエストは自動的にマージできます。" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "このプルリクエストは未対処の例外があるためマージできません。" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "このプルリクエストはターゲットへのプッシュに失敗したためマージできませんでした。" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "このプルリクエストはターゲットが最新でないためマージできません。" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "このプルリクエストはターゲットよりも多くのブランチがソースにあるためマージできません。" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "このプルリクエストはターゲットに複数のヘッドがあるためマージできません。" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "このプルリクエストはターゲットリポジトリがロックされているためマージできません。" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "このプルリクエストはターゲットまたはソースの参照が存在しないためマージできません。" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:119 +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:121 +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:123 +#: rhodecode/model/pull_request.py:122 msgid "" "Pull request cannot be updated because the reference type is not supported " "for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:126 +#: rhodecode/model/pull_request.py:125 msgid "" "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:129 +#: rhodecode/model/pull_request.py:128 msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "%(source_repo)s %(source_ref_name)s からのプルリクエスト #%(pr_id)s をマージ\n\n %(pr_title)s" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "プルリクエストはマージされクローズされました" - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 +#: rhodecode/model/pull_request.py:1166 msgid "Server-side pull request merging is disabled." msgstr "サーバでのプルリクエストのマージは無効化されています。" -#: rhodecode/model/pull_request.py:1154 +#: rhodecode/model/pull_request.py:1168 msgid "This pull request is closed." msgstr "このプルリクエストはクローズしました。" -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "プルリクエストのマージはサポートされていません。" -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "ターゲットリポジトリのラージファイル拡張は無効化されています。" -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "ソースリポジトリのラージファイル拡張は無効化されています。" -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "コミットID" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "閉鎖済みブランチ" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "プルリクエストはレビュワーの承認待ちです。" -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "最新のtip" @@ -3644,32 +3764,32 @@ msgstr "最新のtip" msgid "You can't Edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "ユーザー `%(username)s` を編集できません。このユーザはアプリケーションにとって必要不可欠です。" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 msgid "You can't remove this user since it's crucial for entire application" msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください: %s" -#: rhodecode/model/user.py:519 +#: rhodecode/model/user.py:523 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリグループの所有者のため削除することはできません。リポジトリグループの所有者を変更するか削除してください: %s" -#: rhodecode/model/user.py:528 +#: rhodecode/model/user.py:532 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3721,8 +3841,8 @@ msgstr "不正なユーザーグループ名です" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "ユーザーグループ \"%(usergroup)s\" はすでに存在します" +msgid "User group `%(usergroup)s` already exists" +msgstr "" #: rhodecode/model/validators.py:226 msgid "" @@ -3968,27 +4088,27 @@ msgstr "一般インテグレーションオプション" msgid "{integration_type} settings" msgstr "{integration_type} 設定" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "" "You do not have the permission to store repository groups in the root " "location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4028,440 +4148,454 @@ msgstr "パスワードが正しくありません" msgid "New password must be different to old password" msgstr "新しいパスワードは古いパスワードと異なるものでないといけません" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "結果がありません" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "{0} 年" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "{0} ヶ月" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "{0} 日" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "{0} 時間" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "{0} 分" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "{0} 秒" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "{0} 前" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "結果を読み込み中..." -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "検索中..." -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "一致するものが見つかりません" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "読み込み失敗" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "1 件の結果があります。 Enter で選択できます。" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "{0} 件の結果があります。矢印キーの上下で選択できます。" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "{0} 文字以上入力してください" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "{0} 文字以上入力してください" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "{0} 文字削除してください" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "{0} 文字削除してください" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "{0} 件のみ選択できます" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "{0} 件のみ選択できます" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "ステータスを承認にする" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "ステータスを拒否にする" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "ステータスレビュー" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "選択したステータス ({0}) を元にコメントが自動的に設定されます..." -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "送信中..." -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "読み込み中..." -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "省略された結果" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "省略された結果" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "マッチするファイルはありません" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "セレクション・リンク" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "アンフォロー" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "このリポジトリのフォローする" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "フォロー" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "ファイル" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "もっと表示" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" @@ -4474,7 +4608,7 @@ msgstr "別のコメントを追加" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" @@ -4482,141 +4616,159 @@ msgstr "" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this " +"page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 msgid "No bookmarks available yet." msgstr "まだブックマークがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 msgid "No branches available yet." msgstr "まだブランチがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No gists available yet." msgstr "まだ Gist がありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "まだプルリクエストがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 msgid "No repositories available yet." msgstr "まだリポジトリがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No repository groups available yet." msgstr "まだリポジトリグループがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 msgid "No tags available yet." msgstr "まだタグがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "まだユーザーグループがありません。" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." -msgstr "まだユーザーがいません。" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 +msgid "No user groups available yet." +msgstr "まだユーザーグループがありません。" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "まだユーザーがいません。" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 msgid "Open new pull request" msgstr "新しいプルリクエストを作成" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "選択したコミットから新しいプルリクエストを作成" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "送信" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Updating..." +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "" +"There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "無効" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "有効" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "ファイル" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "読み込み中..." -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" msgstr "" @@ -4652,13 +4804,14 @@ msgstr "ダッシュボード" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "クイックフィルタ..." @@ -4690,19 +4843,19 @@ msgid "Edit Repository Group" msgstr "リポジトリグループを編集" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4712,12 +4865,15 @@ msgid "Name" msgstr "名前" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4725,13 +4881,15 @@ msgstr "名前" #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4739,48 +4897,51 @@ msgstr "名前" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "説明" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "最後の変更点" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "最後の変更点" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4797,7 +4958,7 @@ msgid "Home" msgstr "ホーム" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "サインイン" @@ -4911,6 +5072,70 @@ msgstr "" msgid "Create Account" msgstr "" +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "日時" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "アクション" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "リポジトリ" + #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 msgid "Admin audit logs" @@ -4921,68 +5146,34 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "フィルタ" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:68 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "アクション" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "リポジトリ" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "日時" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" msgstr "まだアクションがありません" @@ -5020,13 +5211,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -5054,21 +5245,21 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 -#: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "リポジトリの種別" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -5123,7 +5314,7 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "plain" @@ -5134,15 +5325,15 @@ msgstr "Gistを更新" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "キャンセル" -#: rhodecode/templates/admin/gists/edit.mako:122 +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " @@ -5175,7 +5366,7 @@ msgid "All Public Gists" msgstr "" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" msgstr "新しい Gist を作成" @@ -5200,14 +5391,14 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5216,6 +5407,7 @@ msgid "Author" msgstr "作成者" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5224,7 +5416,7 @@ msgid "Created on" msgstr "作成日" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "失効" @@ -5258,44 +5450,33 @@ msgstr "公開 Gist を作成" msgid "Gist" msgstr "Gist" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" msgstr "このGistを削除してもよろしいですか？" -#: rhodecode/templates/admin/gists/show.mako:56 -#: rhodecode/templates/admin/integrations/list.mako:204 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:60 -#: rhodecode/templates/data_table/_dt_elements.mako:118 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#: rhodecode/templates/data_table/_dt_elements.mako:193 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "編集" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "Raw形式で表示" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "非公開 Gist" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "作成日" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "Raw形式で表示" @@ -5308,7 +5489,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "リポジトリグループ" @@ -5321,7 +5502,7 @@ msgstr "リポジトリグループ" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 #: rhodecode/templates/base/base.mako:84 -#: rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "設定" @@ -5343,67 +5524,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "すべて" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:115 -msgid "No {type} integrations for repo {repo} exist yet." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:117 -msgid "No {type} integrations for repogroup {repogroup} exist yet." -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:119 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:121 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5419,12 +5600,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "アカウント" @@ -5443,26 +5624,35 @@ msgstr "プロフィール" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "メールアドレス" -#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/my_account/my_account.mako:40 msgid "Watched" msgstr "ウォッチ中" -#: rhodecode/templates/admin/my_account/my_account.mako:40 -#: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:241 +#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 msgid "Pull Requests" msgstr "プルリクエスト" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5471,7 +5661,7 @@ msgstr "プルリクエスト" msgid "Permissions" msgstr "権限設定" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5521,16 +5711,23 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "追加" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5622,11 +5819,11 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5635,7 +5832,7 @@ msgstr "" msgid "Title" msgstr "タイトル" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5644,41 +5841,97 @@ msgstr "" msgid "Repositories You Own" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "作成日" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "" +"SSH Keys usage is currently disabled, please ask your administrator to " +"enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "" +"Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-" +"sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "まだ通知がありません" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "通知を表示" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "通知" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 +msgid "Mark all as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 msgid "Comments" msgstr "コメント" -#: rhodecode/templates/admin/notifications/notifications.mako:37 -msgid "Mark all as read" -msgstr "" - -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "まだ通知がありません" - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "通知を表示" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "通知" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5696,6 +5949,10 @@ msgid "IP Whitelist" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "概要" @@ -5736,32 +5993,45 @@ msgstr "" msgid "External Authentication Account Activation" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "このIPアドレスを削除してもよろしいですか？ : %s" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "すべてのIPアドレスが許可されています" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5816,6 +6086,14 @@ msgstr "選択したパーミッションで、各ユーザーグループのデフォルトパーミッションをリセットします。各ユーザーグループの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください" msgid "Default User Permissions Overview" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "リポジトリグループを追加" @@ -5832,16 +6110,21 @@ msgstr "リポジトリグループ" msgid "Group Name" msgstr "グループ名" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "" @@ -5857,7 +6140,7 @@ msgstr "子グループを追加" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "高度な設定" @@ -5886,18 +6169,6 @@ msgstr "リポジトリグループ: %s" msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" @@ -5907,64 +6178,64 @@ msgstr "" msgid "Delete this repository group" msgstr "このリポジトリグループを削除" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "所有者" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "代理 admin" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "新規追加" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "両方" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." @@ -5975,19 +6246,23 @@ msgstr "" msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "親グループ" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " @@ -6002,7 +6277,7 @@ msgstr "リポジトリグループ管理" msgid "repository groups" msgstr "リポジトリグループ" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "" @@ -6019,52 +6294,52 @@ msgstr "" msgid "Clone from" msgstr "クローン元" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." -msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "" +"Plain text format with support of {metatags}. Add a README file for longer " +"descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:79 -msgid "Set the type of repository to create." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" -msgstr "%s Creating repository" +msgid "{} Creating repository" +msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 msgid "Creating repository" @@ -6095,7 +6370,7 @@ msgid "Remote" msgstr "リモート" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "統計" @@ -6204,7 +6479,7 @@ msgid "Delete forks" msgstr "フォークも削除" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "このリポジトリを削除してもよろしいですか？ : %s" @@ -6229,6 +6504,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6267,7 +6551,7 @@ msgstr "キー" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 @@ -6455,8 +6739,8 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "リポジトリグループ" @@ -6474,9 +6758,9 @@ msgid "Remote uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "編集" @@ -6511,32 +6795,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "リポジトリの所有者を変更" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "非公開リポジトリ" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "統計を有効にする" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "概要ページの統計ウィンドウを有効にします" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "ダウンロードを有効にする" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "概要ページのダウンロードメニューを有効にします" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -6631,7 +6915,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "設定を保存" @@ -6731,7 +7015,7 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6916,6 +7200,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "更新を確認中..." + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6973,10 +7266,6 @@ msgid "" "custom size" msgstr "" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "更新を確認中..." - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7045,97 +7334,97 @@ msgstr "メタタグの着色" #: rhodecode/templates/admin/settings/settings_visual.mako:66 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." -msgstr "リポジトリの説明のメタタグを解析して色つきのタグに変換します。" - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +"Parses meta tags from repository or repository group description fields and " +"turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" msgstr "ダッシュボードの項目" -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" msgstr "メインページダッシュボードの項目" -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "" "Number of items displayed in the main page dashboard before pagination is " "shown." msgstr "メインページダッシュボードで1ページに表示する要素数。" -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" msgstr "管理ページの項目" -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数" -#: rhodecode/templates/admin/settings/settings_visual.mako:117 +#: rhodecode/templates/admin/settings/settings_visual.mako:106 msgid "Commit ID Style" msgstr "コミット ID スタイル" -#: rhodecode/templates/admin/settings/settings_visual.mako:121 +#: rhodecode/templates/admin/settings/settings_visual.mako:110 msgid "Commit sha length" msgstr "コミット SHA 表示文字数" -#: rhodecode/templates/admin/settings/settings_visual.mako:128 +#: rhodecode/templates/admin/settings/settings_visual.mako:117 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." msgstr "Web インターフェースに現れるコミット SHA での表示文字数。\nデフォルトでは r123:9043a6a4c226 のように表示しますが、\nこの設定で `r123:` の後の文字数を指定します。" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" msgstr "コミット ID の数字による参照" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "コミットでリビジョン番号を表示する" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." msgstr "Web インターフェースに現れるコミット SHA でのリビジョン番号表示選択。\nデフォルトでは r123:9043a6a4c226 のように表示しますが、\nこの設定で `r123:` の部分を表示するかどうかを選択します。" -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "アイコン" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "公開リポジトリのアイコンを表示する" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "非公開リポジトリのアイコンを表示する" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "リポジトリ名の横に公開/非公開アイコンを表示します。" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "マークアップレンダラー" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "" "Default renderer used to render comments, pull request descriptions and " "other description elements. After change old entries will still work " "correctly." msgstr "コメントやプルリクエストなどの説明を表示するデフォルトのレンダラーを指定します。変更しても既存のエントリーは正しく表示されます。" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "クローン URL" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -7145,11 +7434,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "クローン URL 生成スキーマ、例: '{scheme}://{user}@{netloc}/{repo}' 次の変数が使えます:\n{scheme} 稼働中の RhodeCode のスキーム 'http' または 'https'\n{user} 現在のユーザー名\n{netloc} 稼働中の RhodeCode のネットワークの場所またはサーバーホスト名\n{repo} リポジトリの完全な名前\n{repoid} リポジトリの ID、ID によるクローンで使用します" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "カスタムサポートリンク" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7190,17 +7479,17 @@ msgid "%s user group settings" msgstr "%s ユーザーグループ設定" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "グローバル権限" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "権限の概要" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "メンバー" @@ -7217,54 +7506,59 @@ msgstr "所属するリポジトリ" msgid "Assigned to repo groups" msgstr "所属するリポジトリグループ" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "ユーサーグループ: %s" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 -msgid "This group is set to be automatically synchronised." -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 +msgid "This group is set to be automatically synchronised." +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "" "Users will be added or removed from this group when they authenticate with " "RhodeCode system, based on LDAP group membership. This requires `LDAP+User " "group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "ユーザーグループを削除" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, python-format msgid "" "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "ユーザーグループ `%(ugroup)s` とその全権限を削除しますか？" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "このユーザーグループを削除" @@ -7298,7 +7592,7 @@ msgstr "ユーザーグループ管理" msgid "user groups" msgstr "ユーザーグループ" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7338,7 +7632,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7369,18 +7663,14 @@ msgstr "ユーザープロフィール" msgid "Auth tokens" msgstr "認証トークン" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "IP アドレスのホワイトリスト" -#: rhodecode/templates/admin/users/user_edit.mako:45 +#: rhodecode/templates/admin/users/user_edit.mako:46 msgid "User Groups Management" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_profile.mako:106 msgid "Source of Record" @@ -7392,104 +7682,91 @@ msgstr "最終ログイン日時" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "最後の活動" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "グループのメンバー数" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "パスワード変更を強制" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "ユーザー: %s" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "パスワードリセットを強制" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "パスワードリセットの強制を無効化" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "パスワードリセットの強制を有効化" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "" "When this is enabled user will have to change they password when they next " "use RhodeCode system. This will also forbid vcs operations until someone " "makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 msgid "Users personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "このユーザーを削除してもよろしいですか？ : %s" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "このユーザーを削除" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "" "When selecting the detach option, the depending objects owned by this user " @@ -7501,10 +7778,6 @@ msgstr "" msgid "User Audit Logs" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 -msgid "audit filter..." -msgstr "" - #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" @@ -7523,10 +7796,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7583,6 +7852,29 @@ msgstr "" msgid "Help translate %(rc_link)s into your language." msgstr "" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "" +"Below is a 2048 bit generated SSH RSA key. You can use it to access " +"RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" msgstr "ユーザー管理" @@ -7624,141 +7916,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: rhodecode/templates/base/base.mako:228 -#: rhodecode/templates/data_table/_dt_elements.mako:12 -#: rhodecode/templates/data_table/_dt_elements.mako:13 -#: rhodecode/templates/data_table/_dt_elements.mako:153 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "要約" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "履歴" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "ファイル" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "比較" -#: rhodecode/templates/base/base.mako:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "%s のプルリクエストを表示" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "オプション" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "フォークを比較" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "%s とフォークを比較" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "検索" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "アンロック" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "ロック" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "フォーク" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "ジャーナル" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "ジャーナル" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:400 msgid "Public journal" msgstr "公開ジャーナル" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:405 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:401 +#: rhodecode/templates/base/base.mako:406 msgid "Gists" msgstr "Gists" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7780,15 +8072,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "キーボードショートカット" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "サイト全体" @@ -7898,9 +8190,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "プレビュー" @@ -7908,77 +8200,94 @@ msgstr "プレビュー" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "表示" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "なし" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "読込" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "書込" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "管理" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "権限" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "権限を編集" -#: rhodecode/templates/base/perms_summary.mako:85 -msgid "Super admin" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:87 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 msgid "Repository default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:88 +#: rhodecode/templates/base/perms_summary.mako:120 msgid "Repository group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:89 +#: rhodecode/templates/base/perms_summary.mako:123 msgid "User group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:126 +msgid "Super admin" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "リポジトリを作成する" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "リポジトリをフォークする" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "ユーザーグループを作成" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8101,93 +8410,74 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "" -"These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "" -"Use rebase instead of creating a merge commit when merging via web " -"interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "" "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -8195,16 +8485,40 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." msgstr "" +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "" +"Use rebase instead of creating a merge commit when merging via web " +"interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "" +"Close branch before merging it into destination branch. No effect when " +"rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -8219,8 +8533,8 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -8241,8 +8555,8 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -8254,54 +8568,54 @@ msgstr "ブランチ %s" msgid "%s Changelog" msgstr "%s チェンジログ" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "%s とフォークを比較" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "選択を解除" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "コミットメッセージ" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "経過時間" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "Refs" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "まだ変更がありません" @@ -8319,8 +8633,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8333,43 +8646,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "コミットメッセージを展開" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "マージ" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8377,7 +8695,7 @@ msgstr "マージ" msgid "Tag %s" msgstr "タグ %s" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8390,100 +8708,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 +#: rhodecode/templates/changeset/changeset.mako:142 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "diffとして差分を表示" -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:143 msgid "Raw Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:143 +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "パッチとして差分を表示" -#: rhodecode/templates/changeset/changeset.mako:144 +#: rhodecode/templates/changeset/changeset.mako:147 msgid "Patch Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:147 +#: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "差分をダウンロード" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8553,12 +8855,12 @@ msgid "Leave a comment on this Commit." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "今すぐログインする" @@ -8578,7 +8880,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "クローズ" @@ -8596,14 +8898,8 @@ msgstr "コメント" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8615,29 +8911,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8645,8 +8925,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -8654,8 +8934,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" msgstr "すべての差分を表示" @@ -8668,65 +8948,50 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "" -"%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:118 +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "ファイルはありません" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "" +"This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "" -"This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:415 #: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format @@ -8785,7 +9050,7 @@ msgstr "" msgid "Wide Mode Diff" msgstr "" -#: rhodecode/templates/codeblocks/source.mako:24 +#: rhodecode/templates/codeblocks/source.mako:25 msgid "view annotation from before this change" msgstr "" @@ -8798,23 +9063,11 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" msgstr "" @@ -8824,12 +9077,6 @@ msgstr "" msgid "%s Compare" msgstr "%s 比較" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 @@ -8843,14 +9090,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "ソース" @@ -8874,71 +9121,69 @@ msgstr "入れ替え" msgid "Compare commits, branches, bookmarks or tags." msgstr "コミット、ブランチ、ブックマークもしくはタグの比較を行います。" -#: rhodecode/templates/data_table/_dt_elements.mako:49 +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "Gitリポジトリ" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" msgstr "Subversionリポジトリ" -#: rhodecode/templates/data_table/_dt_elements.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "公開リポジトリ" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "リポジトリを作成しています..." - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" msgstr "まだコミットがありません" -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "%s の RSS フィードを購読" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "%s の ATOM フィードを購読" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" msgstr "作成中" -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "作成日" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, 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] "このグループを削除してもよろしいですか？ : %s %s 個のリポジトリ" - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "このユーザーグループを削除してもよろしいですか？: %s" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "ユーザーグループ" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "非公開" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "プルリクエスト #%(pr_number)s" @@ -9240,12 +9485,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -9261,12 +9500,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9302,12 +9535,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9375,22 +9602,22 @@ msgid "Create New File" msgstr "新しいファイルを作成" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "変更をコミット" @@ -9445,15 +9672,15 @@ msgid "Delete file" msgstr "ファイルを削除" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "バイナリファイル (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" -msgstr "表示するには大きすぎるファイルです" +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " +msgstr "" #: rhodecode/templates/files/files_delete.mako:70 msgid "Delete File" @@ -9502,15 +9729,15 @@ msgstr "ソース" msgid "annotation" msgstr "アノテーション" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" msgstr "" -#: rhodecode/templates/files/files_edit.mako:74 +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "ファイルを編集" @@ -9518,61 +9745,55 @@ msgstr "ファイルを編集" msgid "Location" msgstr "場所" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" - -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "変更履歴" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" msgstr "全ての履歴を表示" -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 +#: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "ダウンロード" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "ブランチ:%s で編集" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "バイナリファイルの編集は行えません" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9586,22 +9807,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "フォーク名" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "権限のコピー" -#: rhodecode/templates/forks/fork.mako:97 +#: rhodecode/templates/forks/fork.mako:102 msgid "Copy permissions from forked repository" msgstr "フォーク元リポジトリから権限をコピーします" -#: rhodecode/templates/forks/fork.mako:102 +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "このリポジトリをフォーク" @@ -9614,33 +9836,23 @@ msgstr "%s フォーク" msgid "Forks" msgstr "フォーク" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "フォークしました" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "まだフォークがありません" - -#: rhodecode/templates/journal/journal.mako:13 +#: rhodecode/templates/journal/journal.mako:14 msgid "Filter" msgstr "" -#: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "%s 個のエントリ" - -#: rhodecode/templates/journal/journal.mako:23 +#: rhodecode/templates/journal/journal.mako:24 msgid "ATOM journal feed" msgstr "ATOM ジャーナルフィード" -#: rhodecode/templates/journal/journal.mako:24 +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "RSS ジャーナルフィード" @@ -9649,15 +9861,15 @@ msgid "No entries yet" msgstr "まだエントリがありません" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "公開ジャーナル" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "ATOM 公開ジャーナルフィード" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "RSS 公開ジャーナルフィード" @@ -9687,22 +9899,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "プルリクエストレビュアー" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9715,12 +9927,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9745,26 +9951,26 @@ msgstr "" msgid "Merge is not currently possible because of below failed checks." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9785,169 +9991,175 @@ msgstr "このプルリクエストを削除してもよろしいですか？" msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 -#, python-format -msgid "calculated based on %s reviewer vote" -msgid_plural "calculated based on %s reviewers votes" -msgstr[0] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 -msgid "{} version available for this pull request, show it." -msgid_plural "{} versions available for this pull request, show them." -msgstr[0] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 -#, python-format -msgid "%d General " -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "変更を保存" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 +msgid "Mandatory reviewer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "" "These commits cannot be displayed, because this repository uses the " "Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 msgid "" "This pull request cannot be displayed, because one or more commits no longer" " exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 msgid "" "Please update this pull request, push the commits back into the source " "repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 msgid "" "Commits and changes between v{ver_from} and {ver_to} of this pull request, " "commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -10050,7 +10262,7 @@ msgstr "経過時間 (新しい順)" msgid "Age (old first)" msgstr "経過時間 (古い順)" -#: rhodecode/templates/search/search_content.mako:33 +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "このファイル中にさらに一致があります" @@ -10058,84 +10270,74 @@ msgstr "このファイル中にさらに一致があります" msgid "File" msgstr "ファイル" -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "%s 要約" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "%s ATOM フィード" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "%s RSS フィード" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "リードオンリー URL" -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 +#: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 msgid "Show by Name" msgstr "名前で表示" -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 msgid "Show by ID" msgstr "IDで表示" -#: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:61 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "クローンURL" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "統計を有効にする" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "ダウンロード" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" msgstr "ダウンロードを有効にする" @@ -10153,6 +10355,21 @@ msgstr "クイックスタート" msgid "Readme file from commit %s:%s" msgstr "コミット %s:%s の README ファイル" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "%s 要約" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "%s ATOM フィード" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "%s RSS フィード" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" msgstr "" diff --git a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-27 17:25+0200\n" -"PO-Revision-Date: 2017-06-27 15:26+0000\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" +"PO-Revision-Date: 2017-11-03 15:43+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Polish (http://www.transifex.com/rhodecode/RhodeCode/language/pl/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "Globalne" @@ -94,17 +94,86 @@ msgid "System Info" msgstr "Informacje o systemie" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" +msgid "Processes" msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" msgstr "Licencje Otwarto Źródłowe" -#: rhodecode/apps/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "Laboratorium" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "Wystąpił błąd podczas aktualizacji uprawnień" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "Globalne uprawnienia zaktualizowane poprawnie" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "Edycja" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "Utworzono grupę repo %s" + +#: rhodecode/apps/admin/views/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" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "" @@ -267,272 +336,858 @@ msgstr "" msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "Nie możesz edytować tego użytkownika" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "na zawsze" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "5 minut" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "1 godzina" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "1 dzień" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "1 miesiąc" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "Czas życia" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "Wystąpił błąd podczas tworzenia grupy użytkowników %s" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "Użytkownik został zaktualizowany" + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "Użytkownik został usunięty" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "Wystąpił błąd podczas usuwania użytkownika" + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "Wystąpił błąd podczas zapisywania uprawnień" + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "Rola" -#: rhodecode/apps/admin/views/users.py:217 -#: rhodecode/apps/my_account/views.py:191 +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: rhodecode/apps/admin/views/users.py:393 +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "na zawsze" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "5 minut" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "1 godzina" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "1 dzień" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "1 miesiąc" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "Czas życia" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "Wystąpił błąd podczas tworzenia git" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "Usuń gist %s" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/data_table/_dt_elements.mako:323 +msgid "never" +msgstr "nigdy" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 #: rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "Repozytoria" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "Grupy" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "Dziennik publiczny" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "dziennik" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:279 +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" msgstr "" -#: rhodecode/apps/login/views.py:315 +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:321 +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:410 +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "" -#: rhodecode/apps/my_account/views.py:125 +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views.py:132 +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views.py:281 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:70 +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "Twoje konto zostało pomyślnie zaktualizowane" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "Aktualizacja uprawnień grup repozytorium" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" msgstr "Cache wyczyszczony poprawnie" -#: rhodecode/apps/repository/views/repo_caches.py:74 +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "Brak commitów" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "utworzone repozytorium %s z %s" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "Gałęzi %s w repozytorium %s" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "Utworzone repozytorium %s" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "Pokaż białe znaki" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "Pokaż białe znaki dla wszystkich zmian" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "Ignoruj białe znaki" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "Ignoruj białe znaki dla wszystkich zmian" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "" +"Changing the status of a commit associated with a closed pull request is not" +" allowed" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "" +"Repositories unrelated. Cannot compare commit %(commit1)s from repository " +"%(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "Zmiany w %s repozytorium" + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "%s %s zasilać" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "Pobieranie wyłączone" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "Puste repozytorium" + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "Nieznany typ archiwum" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "Różnice" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "Gałęzie" + +#: rhodecode/apps/repository/views/repo_files.py:890 +#: rhodecode/model/scm.py:791 rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "Etykiety" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "Wystąpił błąd w trakcie zatwierdzania" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "Bez zmian" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "Brak nazwy pliku" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "" +"The location specified must be a relative path and must not contain .. in " +"the path" +msgstr "" + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "Porównaj rozwidlenie" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" msgstr "Uprawnienia repozytorium zostały zaktualizowane" +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +msgid "Pull request requires a title with min. 3 chars" +msgstr "Wniosek połączenia gałęzi wymaga tytułu z min. 3 znakami" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "" +"Pull request updated to \"{source_commit_id}\" with {count_added} added, " +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" +msgstr "" + #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "Odblokowany" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "Zablokowany" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "Repozytoriów jest %s" + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "Wystąpił błąd podczas odblokowywania" + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "Oderwane rozgałęzienie %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "Usunięte repozytorium %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "" "Cannot delete `{repo}` it still contains attached forks. Try using " "{delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 msgid "An error occurred during setting this repository in public journal" msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "Brak" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" msgstr "Zablokowane repozytorium" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" msgstr "Odblokowane repozytorium" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "Wystąpił błąd podczas odblokowywania" - -#: rhodecode/apps/repository/views/repo_summary.py:293 +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "Wystąpił błąd podczas zapisywania e-maila" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "Pobieranie z lokalizacji zdalnej" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "Aktualizacja ustawień VCS" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" msgstr "gałąź" -#: rhodecode/apps/repository/views/repo_summary.py:294 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" msgstr "Tag" -#: rhodecode/apps/repository/views/repo_summary.py:295 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" msgstr "Bookmark" -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "Gałęzie" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" msgstr "Zamkniętę gałęzie" +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "Zaktualizowano grupę użytkowników %s" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "Wystąpił błąd podczas aktualizacji grupy użytkowników %s" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "Grupa użytkowników została usunięta z powodzeniem" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "Grupa docelowa nie może być taka sama" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "Aktualizacja uprawnień grupy użytkowników" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" msgstr "" #: rhodecode/authentication/schema.py:35 @@ -540,21 +1195,21 @@ msgid "Enable or disable this authentica msgstr "" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" msgstr "Włączone" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication responsecall for this plugin. \n" -"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:49 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" msgstr "" @@ -563,15 +1218,15 @@ msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:177 +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:187 +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." msgstr "" @@ -658,7 +1313,6 @@ msgid "The url of the Jasig CAS REST ser msgstr "" #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "Adres URL" @@ -697,10 +1351,11 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Hasło" @@ -791,7 +1446,7 @@ msgstr "" msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:365 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" msgstr "LDAP" @@ -824,480 +1479,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "Brak commitów" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "Pokaż białe znaki" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "Pokaż białe znaki dla wszystkich zmian" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "Ignoruj białe znaki" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "Ignoruj białe znaki dla wszystkich zmian" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "" - -#: rhodecode/controllers/changeset.py:343 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "" - -#: rhodecode/controllers/changeset.py:387 -msgid "" -"Changing the status of a commit associated with a closed pull request is not" -" allowed" -msgstr "" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "" -"Repositories unrelated. Cannot compare commit %(commit1)s from repository " -"%(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "Zmiany w %s repozytorium" - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "%s %s zasilać" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "" - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "Wystąpił błąd w trakcie zatwierdzania" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -msgid "You can only edit files with revision being a valid branch " -msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "Bez zmian" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "Brak nazwy pliku" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "" -"The location specified must be a relative path and must not contain .. in " -"the path" -msgstr "" - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "Pobieranie wyłączone" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "Nieznana wersja %s" - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "Puste repozytorium" - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "Nieznany typ archiwum" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "Różnice" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "Etykiety" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "Dziennik publiczny" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "dziennik" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:216 -msgid "Pull request requires a title with min. 3 chars" -msgstr "Wniosek połączenia gałęzi wymaga tytułu z min. 3 znakami" - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:346 -msgid "" -"Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "Wystąpił błąd podczas tworzenia git" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "Usuń gist %s" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -msgid "never" -msgstr "nigdy" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "" - -#: rhodecode/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" - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "Twoje konto zostało pomyślnie zaktualizowane" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "Wystąpił błąd podczas aktualizacji uprawnień" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "Globalne uprawnienia zaktualizowane poprawnie" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "Utworzono grupę repo %s" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "Zaktualizowano grupę repo %s" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, python-format -msgid "Error occurred during update of repository group %s" -msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "Usunięto grupę repo %s" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, python-format -msgid "Error occurred during deletion of repository group %s" -msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "Aktualizacja uprawnień grup repozytorium" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "utworzone repozytorium %s" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "utworzone repozytorium %s z %s" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "Gałęzi %s w repozytorium %s" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "Utworzone repozytorium %s" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "Wystąpił błąd podczas zapisywania e-maila" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "Odblokowany" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "Zablokowany" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "Repozytoriów jest %s" - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "Pobieranie z lokalizacji zdalnej" - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "" - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "Aktualizacja ustawień VCS" - #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" @@ -1348,205 +1529,59 @@ msgstr "" msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "Wystąpił błąd podczas tworzenia grupy użytkowników %s" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "Zaktualizowano grupę użytkowników %s" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "Wystąpił błąd podczas aktualizacji grupy użytkowników %s" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "Grupa użytkowników została usunięta z powodzeniem" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "Grupa docelowa nie może być taka sama" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "Aktualizacja uprawnień grupy użytkowników" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "Wystąpił błąd podczas zapisywania uprawnień" - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "Użytkownik został zaktualizowany" - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "Użytkownik został usunięty" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "Wystąpił błąd podczas usuwania użytkownika" - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:396 -msgid "" -"The user participates as reviewer in pull requests and cannot be deleted. " -"You can set the user to \"inactive\" instead of deleting it." -msgstr "" - -#: rhodecode/controllers/admin/users.py:462 -msgid "User global permissions updated successfully" -msgstr "" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:166 +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "" @@ -1582,54 +1617,60 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 -#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "Zresetuj" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1668,28 +1709,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1773,17 +1814,19 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1819,132 +1862,158 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:166 -msgid "" -"URL of the webhook to receive POST event. Following variables are allowed to" -" be used: {vars}. Some of the variables would trigger multiple calls, like " +#: rhodecode/integrations/types/webhook.py:179 +msgid "" +"URL to which Webhook should submit data. Following variables are allowed to " +"be used: {vars}. Some of the variables would trigger multiple calls, like " "${{branch}} or ${{commit_id}}. Webhook will be called as many times as " "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "" +"Optional string used to validate received payloads. It will be sent together" +" with event data in JSON" msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr "[usunięte] repozytorium" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "[utworzone] repozytorium" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "[rozgałęzione] repozytorium" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "[zaktualizowane] repozytorium" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "[pobierz] archiwum z repozytorium" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "[utworzona] grupa użytkowników" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "[zaktualizowana] grupa użytkowników" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:148 +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "[wysłane zmiany] w" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "[synchronizacja przez RhodeCode] z repozytorium" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "[pobrano] " -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "nazwa rozgałęzienia %s" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1955,52 +2024,42 @@ msgstr "Połączonych gałęzi #%s" msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "Wyświetl porównanie" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1220 +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 msgid "You need to be a registered user to perform this action" msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie" -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "" - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "" - #: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" @@ -2018,20 +2077,11 @@ msgstr "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby wyświetlić różnice" msgid "No changes detected" msgstr "Nie wykryto zmian" -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr "i %s więcej" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "Brak Plików" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2051,7 +2101,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2065,54 +2115,54 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, 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" -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "przed chwilą" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2129,24 +2179,25 @@ msgstr "przed chwilą" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 +#: rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "Brak dostępu do repozytorium" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2163,24 +2214,25 @@ msgstr "Brak dostępu do repozytorium" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 +#: rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "Repozytorium do odczytu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2197,24 +2249,25 @@ msgstr "Repozytorium do odczytu" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 +#: rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "Repozytorium do zapisu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2231,48 +2284,49 @@ msgstr "Repozytorium do zapisu" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/model/db.py:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 +#: rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "Administracja dostępu do repozytorium" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "Grupy repozytoriów brak dostępu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "Grupy repozytoriów dostęp do odczytu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "Grupy repozytoriów dostęp do zapisu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "Repozytoria Grupy dostęp administratora" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2288,7 +2342,7 @@ msgstr "Repozytoria Grupy dostęp administratora" msgid "RhodeCode Administrator" msgstr "Administrator Repo" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2305,24 +2359,25 @@ msgstr "Administrator Repo" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 +#: rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "Tworzenie repozytorium jest wyłączone" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2339,24 +2394,25 @@ msgstr "Tworzenie repozytorium jest wyłączone" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/model/db.py:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 +#: rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "Tworzenie repozytorium jest włączone" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2373,24 +2429,25 @@ msgstr "Tworzenie repozytorium jest włączone" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 -#: rhodecode/model/db.py:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 +#: rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "Rozwidlenie repozytorium wyłączone" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2407,45 +2464,46 @@ msgstr "Rozwidlenie repozytorium wyłączone" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 +#: rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "Rozwidlenie repozytorium włączone" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "Rejestracja wyłączona" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2462,24 +2520,25 @@ msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 -#: rhodecode/model/db.py:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 +#: rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "Brak Korekty" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2496,24 +2555,25 @@ msgstr "Brak Korekty" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 -#: rhodecode/model/db.py:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 +#: rhodecode/model/db.py:3325 msgid "Approved" msgstr "Zaakceptowano" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2530,24 +2590,25 @@ msgstr "Zaakceptowano" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 -#: rhodecode/model/db.py:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 +#: rhodecode/model/db.py:3326 msgid "Rejected" msgstr "Odrzucono" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2564,20 +2625,21 @@ msgstr "Odrzucono" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 -#: rhodecode/model/db.py:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 +#: rhodecode/model/db.py:3327 msgid "Under Review" msgstr "Objęty Przeglądem" @@ -2595,20 +2657,21 @@ msgstr "Objęty Przeglądem" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 +#: rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "Grupy repozytoriów brak dostępu" @@ -2626,20 +2689,21 @@ msgstr "Grupy repozytoriów brak dostępu" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 +#: rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "Grupy repozytoriów dostęp do odczytu" @@ -2657,20 +2721,21 @@ msgstr "Grupy repozytoriów dostęp do odczytu" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 +#: rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "Grupy repozytoriów dostęp do zapisu" @@ -2688,20 +2753,21 @@ msgstr "Grupy repozytoriów dostęp do zapisu" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/model/db.py:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 +#: rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "Repozytoria Grupy dostęp administratora" @@ -2718,20 +2784,21 @@ msgstr "Repozytoria Grupy dostęp administratora" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 +#: rhodecode/model/db.py:2605 msgid "User group no access" msgstr "Ta grupa użytkowników nie ma dostępu" @@ -2748,20 +2815,21 @@ msgstr "Ta grupa użytkowników nie ma dostępu" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/model/db.py:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 +#: rhodecode/model/db.py:2606 msgid "User group read access" msgstr "Dostęp do grupy parametrów użytkownika" @@ -2778,20 +2846,21 @@ msgstr "Dostęp do grupy parametrów użytkownika" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 +#: rhodecode/model/db.py:2607 msgid "User group write access" msgstr "Ta grupa użytkowników ma prawo do zapisu" @@ -2808,20 +2877,21 @@ msgstr "Ta grupa użytkowników ma prawo do zapisu" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 +#: rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "Ta grupa użytkowników ma uprawnienia administratora" @@ -2838,20 +2908,21 @@ msgstr "Ta grupa użytkowników ma uprawnienia administratora" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 +#: rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "Tworzenie grup repozytoriów wyłączone" @@ -2868,20 +2939,21 @@ msgstr "Tworzenie grup repozytoriów wyłączone" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 +#: rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "Tworzenie grup repozytoriów włączone" @@ -2898,20 +2970,21 @@ msgstr "Tworzenie grup repozytoriów włączone" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 +#: rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "Tworzenie grup użytkowników wyłączone" @@ -2928,20 +3001,21 @@ msgstr "Tworzenie grup użytkowników wyłączone" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 +#: rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "Tworzenie grup użytkowników właczone" @@ -2958,20 +3032,21 @@ msgstr "Tworzenie grup użytkowników właczone" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/model/db.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 +#: rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "Rejestracja wyłączona" @@ -2988,20 +3063,21 @@ msgstr "Rejestracja wyłączona" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 -#: rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 +#: rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" @@ -3018,20 +3094,21 @@ msgstr "Rejestracja użytkownika z ręczną aktywacją konta" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 +#: rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" @@ -3048,20 +3125,21 @@ msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 -#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 +#: rhodecode/model/db.py:2632 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "Ręczna aktywacja nowego konta" @@ -3078,20 +3156,21 @@ msgstr "Ręczna aktywacja nowego konta" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 -#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 +#: rhodecode/model/db.py:2633 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "Automatyczna aktywacja nowego konta" @@ -3102,20 +3181,21 @@ msgstr "Automatyczna aktywacja nowego ko #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 +#: rhodecode/model/db.py:2618 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3127,20 +3207,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 +#: rhodecode/model/db.py:2619 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3149,79 +3230,74 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 +#: rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 +#: rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 -#: rhodecode/model/db.py:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "" - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 -#: rhodecode/model/db.py:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 +#: rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 -msgid "all" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 +#: rhodecode/model/db.py:1099 +msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 @@ -3230,8 +3306,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 +#: rhodecode/model/db.py:1100 +msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 @@ -3240,8 +3318,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 +#: rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 @@ -3250,36 +3330,54 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 +#: rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 +#: rhodecode/model/db.py:1103 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 -#: rhodecode/model/db.py:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 +#: rhodecode/model/db.py:2356 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 -#: rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 +#: rhodecode/model/db.py:2628 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/model/db.py:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 +#: rhodecode/model/db.py:2629 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/model/db.py:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 +#: rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3315,112 +3413,128 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:374 -msgid "made a comment" +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" msgstr "" #: rhodecode/model/comment.py:375 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "Wpisz login" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Wprowadź wartość %(min)i znaków lub więcej" -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "Wpisz hasło" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "Wpisz %(min)i lub więcej znaków" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 +#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 +#: rhodecode/model/permission.py:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "Brak" -#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 -#: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 +#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 +#: rhodecode/model/permission.py:81 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "Odczyt" -#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 -#: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3428,8 +3542,8 @@ msgstr "Odczyt" msgid "Write" msgstr "Zapis" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3443,7 +3557,7 @@ msgstr "Zapis" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3458,189 +3572,189 @@ msgstr "Zapis" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "Administracja" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "Wyłączone" -#: rhodecode/model/permission.py:86 +#: rhodecode/model/permission.py:87 msgid "Allowed with manual account activation" msgstr "Dozwolona z ręczną aktywacją konta" -#: rhodecode/model/permission.py:87 +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "Dozwolona z automatyczną aktywacją konta" -#: rhodecode/model/permission.py:90 +#: rhodecode/model/permission.py:91 msgid "Allow password recovery" msgstr "" -#: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" -msgstr "" - #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:119 +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:121 +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:123 +#: rhodecode/model/pull_request.py:122 msgid "" "Pull request cannot be updated because the reference type is not supported " "for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:126 +#: rhodecode/model/pull_request.py:125 msgid "" "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:129 +#: rhodecode/model/pull_request.py:128 msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "" - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 -msgid "Server-side pull request merging is disabled." -msgstr "" - -#: rhodecode/model/pull_request.py:1154 -msgid "This pull request is closed." -msgstr "" - #: rhodecode/model/pull_request.py:1166 +msgid "Server-side pull request merging is disabled." +msgstr "" + +#: rhodecode/model/pull_request.py:1168 +msgid "This pull request is closed." +msgstr "" + +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "Zakładki" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "Zamknięte Gałęzie" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "ostatni tip" @@ -3648,32 +3762,32 @@ msgstr "ostatni tip" 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" -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 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" -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "" -#: rhodecode/model/user.py:519 +#: rhodecode/model/user.py:523 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "" -#: rhodecode/model/user.py:528 +#: rhodecode/model/user.py:532 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3725,8 +3839,8 @@ msgstr "Niewłaściwa nazwa grupy" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "Nazwa grupy \"%(usergroup)s\" już istnieje" +msgid "User group `%(usergroup)s` already exists" +msgstr "" #: rhodecode/model/validators.py:226 msgid "" @@ -3972,27 +4086,27 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "" "You do not have the permission to store repository groups in the root " "location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4032,440 +4146,454 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Przesyłanie..." -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "Ładuję..." -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Nie ma plików pasujących" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Wybór linku" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Nie obserwuj" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Zacznij obserwację tego repozytorium" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Obserwuj" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "Pokaż więcej" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" @@ -4478,7 +4606,7 @@ msgstr "Dodaj kolejny komentarz" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "Zamknij" @@ -4486,141 +4614,159 @@ msgstr "Zamknij" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this " +"page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No branches available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No gists available yet." +msgid "No bookmarks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" -msgstr "Otwórz nową prośbę o połączenie gałęzi" +msgid "No user groups available yet." +msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 +msgid "Open new pull request" +msgstr "Otwórz nową prośbę o połączenie gałęzi" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "Wyślij" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Updating..." +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "" +"There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "pliki" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "wczytywanie..." -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "{0} aktywnych z {1} użytkowników" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" msgstr "" @@ -4656,13 +4802,14 @@ msgstr "Repozytorium" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "szybki filtr..." @@ -4694,19 +4841,19 @@ msgid "Edit Repository Group" msgstr "Edytuj Grupę Repozytoriów" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4716,12 +4863,15 @@ msgid "Name" msgstr "Nazwa" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4729,13 +4879,15 @@ msgstr "Nazwa" #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4743,48 +4895,51 @@ msgstr "Nazwa" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "Opis" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "Ostatnia akytwność" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "Właściciel" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "Ostatnia akytwność" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4801,7 +4956,7 @@ msgid "Home" msgstr "Strona Główna" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Zaloguj się" @@ -4915,6 +5070,70 @@ msgstr "" msgid "Create Account" msgstr "" +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "Data" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "Działanie" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "Repozytorium" + #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 msgid "Admin audit logs" @@ -4925,68 +5144,34 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "filtr" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:68 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "Działanie" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "Repozytorium" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "Data" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" msgstr "Brak akcji" @@ -5024,13 +5209,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -5058,21 +5243,21 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 -#: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Typ" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -5127,7 +5312,7 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "zwykły" @@ -5138,15 +5323,15 @@ msgstr "Zaktualizuj Gist" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "Anuluj" -#: rhodecode/templates/admin/gists/edit.mako:122 +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " @@ -5179,7 +5364,7 @@ msgid "All Public Gists" msgstr "" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" msgstr "Utwórz Nowy Gist" @@ -5204,14 +5389,14 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5220,6 +5405,7 @@ msgid "Author" msgstr "Autor" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5228,7 +5414,7 @@ msgid "Created on" msgstr "Utworzono" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "Wygasa" @@ -5262,44 +5448,33 @@ msgstr "Utwórz Publiczny Gist" msgid "Gist" msgstr "Gist" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" msgstr "Potwierdź aby usunąć ten Gist" -#: rhodecode/templates/admin/gists/show.mako:56 -#: rhodecode/templates/admin/integrations/list.mako:204 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:60 -#: rhodecode/templates/data_table/_dt_elements.mako:118 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#: rhodecode/templates/data_table/_dt_elements.mako:193 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "Edycja" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "Prywatny Gist" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "utworzono" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "wyświetl jako raw" @@ -5312,7 +5487,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "Grupy Repozytoriów" @@ -5325,7 +5500,7 @@ msgstr "Grupy Repozytoriów" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 #: rhodecode/templates/base/base.mako:84 -#: rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Ustawienia" @@ -5347,67 +5522,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "Wszystkie" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:115 -msgid "No {type} integrations for repo {repo} exist yet." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:117 -msgid "No {type} integrations for repogroup {repogroup} exist yet." -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:119 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:121 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5423,12 +5598,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "Moje konto" @@ -5447,26 +5622,35 @@ msgstr "Profil" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/my_account/my_account.mako:40 msgid "Watched" msgstr "Obserwowane" -#: rhodecode/templates/admin/my_account/my_account.mako:40 -#: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:241 +#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 msgid "Pull Requests" msgstr "Połączone gałęzie" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5475,7 +5659,7 @@ msgstr "Połączone gałęzie" msgid "Permissions" msgstr "Uprawnienia" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5525,16 +5709,23 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "Dodaj" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5626,11 +5817,11 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5639,7 +5830,7 @@ msgstr "" msgid "Title" msgstr "Tytuł" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5648,41 +5839,97 @@ msgstr "" msgid "Repositories You Own" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "Utworzono" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "" +"SSH Keys usage is currently disabled, please ask your administrator to " +"enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "" +"Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-" +"sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "Brak powiadomień" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "Pokaż powiadomienia" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "Opcje powiadomień" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 +msgid "Mark all as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 msgid "Comments" msgstr "Komentarze" -#: rhodecode/templates/admin/notifications/notifications.mako:37 -msgid "Mark all as read" -msgstr "" - -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "Brak powiadomień" - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "Pokaż powiadomienia" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "Powiadomienia" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5700,6 +5947,10 @@ msgid "IP Whitelist" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "Podgląd" @@ -5740,32 +5991,45 @@ msgstr "" msgid "External Authentication Account Activation" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "Potwierdź, aby usunąć to ip: %s" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "Wszystkie adresy IP są dozwolone" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5820,6 +6084,14 @@ 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" msgid "Default User Permissions Overview" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "Repozytorium grupy" @@ -5836,16 +6108,21 @@ msgstr "Repozytorium grupy" msgid "Group Name" msgstr "Nazwa Grupy" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "" @@ -5861,7 +6138,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "Zaawansowane" @@ -5890,24 +6167,6 @@ msgstr "Grupa Repozytoriów: %s" msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" @@ -5917,64 +6176,64 @@ msgstr "" msgid "Delete this repository group" msgstr "Usuń ta grupę repozytoriów" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "właściciel" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "Dodaj nowe" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "Oba" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." @@ -5985,19 +6244,23 @@ msgstr "" msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "Rodzic gropy" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " @@ -6012,7 +6275,7 @@ msgstr "Repozytoria grup administracyjny msgid "repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "" @@ -6029,51 +6292,51 @@ msgstr "" msgid "Clone from" msgstr "Klonuj z" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -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." - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "" +"Plain text format with support of {metatags}. Add a README file for longer " +"descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:79 -msgid "Set the type of repository to create." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" +msgid "{} Creating repository" msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 @@ -6105,7 +6368,7 @@ msgid "Remote" msgstr "Zdalnie" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "Statystyki" @@ -6214,7 +6477,7 @@ msgid "Delete forks" msgstr "Usuń rozwidlenie" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Potwierdź usunięcie repozytorium: %s" @@ -6239,6 +6502,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6277,7 +6549,7 @@ msgstr "Klucz" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 @@ -6465,8 +6737,8 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "Repozytorium grupy" @@ -6484,9 +6756,9 @@ msgid "Remote uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "edycja" @@ -6521,32 +6793,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "Zmiana właściciela tego repozytorium." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "Prywatne repozytorium" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "Włącz statystyki" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "Włącz okno statystyk na stronie podsumowania." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "Włącz pobieranie" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "Włącz menu pobierania na stronie podsumowania." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -6641,7 +6913,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "Zapisz ustawienia" @@ -6741,7 +7013,7 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6926,6 +7198,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6983,10 +7264,6 @@ msgid "" "custom size" msgstr "" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7055,97 +7332,97 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:66 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +"Parses meta tags from repository or repository group description fields and " +"turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "" "Number of items displayed in the main page dashboard before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:117 +#: rhodecode/templates/admin/settings/settings_visual.mako:106 msgid "Commit ID Style" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:121 +#: rhodecode/templates/admin/settings/settings_visual.mako:110 msgid "Commit sha length" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:128 +#: rhodecode/templates/admin/settings/settings_visual.mako:117 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "Ikony" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "" "Default renderer used to render comments, pull request descriptions and " "other description elements. After change old entries will still work " "correctly." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -7155,11 +7432,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7200,17 +7477,17 @@ msgid "%s user group settings" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "Użytkownik" @@ -7227,54 +7504,59 @@ msgstr "" msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 -msgid "This group is set to be automatically synchronised." -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 +msgid "This group is set to be automatically synchronised." +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "" "Users will be added or removed from this group when they authenticate with " "RhodeCode system, based on LDAP group membership. This requires `LDAP+User " "group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, python-format msgid "" "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "" @@ -7308,7 +7590,7 @@ msgstr "Użytkownicy grupy administracji" msgid "user groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7348,7 +7630,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7379,16 +7661,12 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "User Groups Management" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" +msgid "User Groups Management" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 @@ -7402,113 +7680,91 @@ msgstr "Ostatnio zalogowany" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "" "When this is enabled user will have to change they password when they next " "use RhodeCode system. This will also forbid vcs operations until someone " "makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 msgid "Users personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "Potwierdź usunięcie tego użytkownika: %s" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "" "When selecting the detach option, the depending objects owned by this user " @@ -7520,10 +7776,6 @@ msgstr "" msgid "User Audit Logs" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 -msgid "audit filter..." -msgstr "" - #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" @@ -7542,10 +7794,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7602,6 +7850,29 @@ msgstr "" msgid "Help translate %(rc_link)s into your language." msgstr "" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "" +"Below is a 2048 bit generated SSH RSA key. You can use it to access " +"RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" msgstr "Administracja użytkownikami" @@ -7643,141 +7914,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: rhodecode/templates/base/base.mako:228 -#: rhodecode/templates/data_table/_dt_elements.mako:12 -#: rhodecode/templates/data_table/_dt_elements.mako:13 -#: rhodecode/templates/data_table/_dt_elements.mako:153 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "Podsumowanie" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "Dziennik zmian" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Pliki" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Porównaj" -#: rhodecode/templates/base/base.mako:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "Pokaż Prośby Pobrania %s" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "Opcje" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "Porównaj rozwidlenie" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "porównaj gałęzie %s" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Szukaj" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "Odblokowany" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "zablokowane" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "Gałąź" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "Dziennik" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "Dziennik" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:400 msgid "Public journal" msgstr "Dziennik publiczny" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:405 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:401 +#: rhodecode/templates/base/base.mako:406 msgid "Gists" msgstr "Gists" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7799,15 +8070,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "Idź do" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "" @@ -7917,9 +8188,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "Podgląd" @@ -7927,77 +8198,94 @@ msgstr "Podgląd" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "brak" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "odczyt" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "zapis" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "administracja" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "Uprawnienia" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "Edycja Uprawnień" -#: rhodecode/templates/base/perms_summary.mako:85 -msgid "Super admin" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:87 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 msgid "Repository default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:88 +#: rhodecode/templates/base/perms_summary.mako:120 msgid "Repository group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:89 +#: rhodecode/templates/base/perms_summary.mako:123 msgid "User group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:126 +msgid "Super admin" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "Utwórz repozytorium" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "Rozwidlenie repozytorium" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "Tworzenie grup użytkowników" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8120,93 +8408,74 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "" -"These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "" -"Use rebase instead of creating a merge commit when merging via web " -"interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "" "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -8214,16 +8483,40 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." msgstr "" +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "" +"Use rebase instead of creating a merge commit when merging via web " +"interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "" +"Close branch before merging it into destination branch. No effect when " +"rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -8238,8 +8531,8 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -8260,8 +8553,8 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -8273,57 +8566,54 @@ msgstr "Gałęzie %s" msgid "%s Changelog" msgstr "%s Dziennik zmian" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "porównaj gałęzie %s" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "Wyczyść zaznaczenie" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "Ostatnia zmiana" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "Gałąź/Etykieta" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "Nie ma jeszcze zmian" @@ -8341,8 +8631,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8355,43 +8644,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "połącz" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8399,7 +8693,7 @@ msgstr "połącz" msgid "Tag %s" msgstr "Tagi %s" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8412,106 +8706,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 +#: rhodecode/templates/changeset/changeset.mako:142 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "Raw różnic" -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:143 msgid "Raw Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:143 +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "Poprawka różnic" -#: rhodecode/templates/changeset/changeset.mako:144 +#: rhodecode/templates/changeset/changeset.mako:147 msgid "Patch Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:147 +#: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "Pobierz różnice" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8581,12 +8853,12 @@ msgid "Leave a comment on this Commit." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Zaloguj się teraz" @@ -8606,7 +8878,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Zamknięte" @@ -8624,17 +8896,8 @@ msgstr "Komentarz" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8646,35 +8909,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8682,8 +8923,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -8691,8 +8932,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" msgstr "Pokaż pełną historię" @@ -8705,74 +8946,50 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "" -"%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:118 +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "Brak plików" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "" +"This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "" -"This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:415 #: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format @@ -8831,7 +9048,7 @@ msgstr "" msgid "Wide Mode Diff" msgstr "" -#: rhodecode/templates/codeblocks/source.mako:24 +#: rhodecode/templates/codeblocks/source.mako:25 msgid "view annotation from before this change" msgstr "" @@ -8844,29 +9061,11 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" msgstr "" @@ -8876,15 +9075,6 @@ msgstr "" msgid "%s Compare" msgstr "%s Porównaj" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 @@ -8898,14 +9088,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "Źródło" @@ -8929,74 +9119,69 @@ msgstr "" msgid "Compare commits, branches, bookmarks or tags." msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:49 +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "Repozytorium mercurial" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "Repozytorium git" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "Publiczne repozytorium" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "Subskrybuj %s kanał rss" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "Subskrybuj %s kanał atom" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "Utworzono" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, 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] "Potwierdź żeby usunąć grupę %s wraz z %s repozytorium" -msgstr[1] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami" -msgstr[2] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami" -msgstr[3] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami" - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Potwierdź usunięcie grupy użytkowników: %s" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "Grupa użytkownika" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "Prywatny" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" @@ -9298,15 +9483,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -9322,15 +9498,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9366,15 +9533,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9442,22 +9600,22 @@ msgid "Create New File" msgstr "" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "Zatwierdź zmiany" @@ -9512,15 +9670,15 @@ msgid "Delete file" msgstr "Usuń plik" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "Plik binarny (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" -msgstr "Plik jest za duży do wyświetlenia" +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " +msgstr "" #: rhodecode/templates/files/files_delete.mako:70 msgid "Delete File" @@ -9569,15 +9727,15 @@ msgstr "Źródło" msgid "annotation" msgstr "adnotacja" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" msgstr "" -#: rhodecode/templates/files/files_edit.mako:74 +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "Edycja pliku" @@ -9585,64 +9743,55 @@ msgstr "Edycja pliku" msgid "Location" msgstr "Położenie" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "Historia" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 -msgid "Annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 -msgid "Raw" -msgstr "" - #: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 +msgid "Annotation" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 +msgid "Raw" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Pobierz" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "Edycja plików binarnych jest zabroniona" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9656,22 +9805,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "Nazwa rozgałęzienia" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "Skopiuj uprawnienia" -#: rhodecode/templates/forks/fork.mako:97 +#: rhodecode/templates/forks/fork.mako:102 msgid "Copy permissions from forked repository" msgstr "Skopiuj zezwolenia z rozwidlenia repozytorium" -#: rhodecode/templates/forks/fork.mako:102 +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "" @@ -9684,36 +9834,23 @@ msgstr "Gałąź %s" msgid "Forks" msgstr "Gałęzie" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "Rozgałęziony" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "Nie ma jeszcze gałęzi" - -#: rhodecode/templates/journal/journal.mako:13 +#: rhodecode/templates/journal/journal.mako:14 msgid "Filter" msgstr "" -#: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "%s wejście" -msgstr[1] "%s wejść" -msgstr[2] "%s wejść" -msgstr[3] "%s wejść" - -#: rhodecode/templates/journal/journal.mako:23 +#: rhodecode/templates/journal/journal.mako:24 msgid "ATOM journal feed" msgstr "Dziennik kanału ATOM" -#: rhodecode/templates/journal/journal.mako:24 +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "Dziennik kanału RSS" @@ -9722,15 +9859,15 @@ msgid "No entries yet" msgstr "Brak wpisów jeszcze" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "Dziennik Publiczny" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "Publiczny dziennik kanału ATOM" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "Publiczny dziennik kanału RSS" @@ -9760,22 +9897,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "Recenzje wniosków połączenia gałęzi" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9788,15 +9925,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9821,26 +9949,26 @@ msgstr "" msgid "Merge is not currently possible because of below failed checks." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9861,175 +9989,175 @@ msgstr "Potwierdź usunięcie połączenia gałęzi" msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 -#, python-format -msgid "calculated based on %s reviewer vote" -msgid_plural "calculated based on %s reviewers votes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 -msgid "{} version available for this pull request, show it." -msgid_plural "{} versions available for this pull request, show them." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 -#, python-format -msgid "%d General " -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "Zapisz zmiany" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 +msgid "Mandatory reviewer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "" "These commits cannot be displayed, because this repository uses the " "Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 msgid "" "This pull request cannot be displayed, because one or more commits no longer" " exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 msgid "" "Please update this pull request, push the commits back into the source " "repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 msgid "" "Commits and changes between v{ver_from} and {ver_to} of this pull request, " "commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -10132,7 +10260,7 @@ msgstr "" msgid "Age (old first)" msgstr "" -#: rhodecode/templates/search/search_content.mako:33 +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "" @@ -10140,84 +10268,74 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "Podsumowanie %s" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "%s ATOM" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "%s RSS" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 -msgid "Show by Name" -msgstr "Pokaż nazwę" - -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 -msgid "Show by ID" -msgstr "Pokaż ID" - -#: rhodecode/templates/summary/components.mako:56 -msgid "SVN Protocol is disabled. To enable it, see the" -msgstr "" - #: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 +msgid "Show by Name" +msgstr "Pokaż nazwę" + +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 +msgid "Show by ID" +msgstr "Pokaż ID" + +#: rhodecode/templates/summary/components.mako:61 +msgid "SVN Protocol is disabled. To enable it, see the" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "Url klonowania" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "Nie pobrano jeszcze plików" -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" msgstr "" @@ -10235,6 +10353,21 @@ msgstr "Szybki start" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "Podsumowanie %s" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "%s ATOM" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "%s RSS" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" msgstr "" diff --git a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-27 17:25+0200\n" -"PO-Revision-Date: 2017-06-27 15:26+0000\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" +"PO-Revision-Date: 2017-11-03 15:43+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Portuguese (http://www.transifex.com/rhodecode/RhodeCode/language/pt/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "Global" @@ -90,17 +90,86 @@ msgid "System Info" msgstr "Informações do Sistema" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" -msgstr "Sessões do usuário" +msgid "Processes" +msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "Sessões do usuário" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" msgstr "Licenças Open Source" -#: rhodecode/apps/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "Labs" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "Configurações padrão atualizadas com sucesso" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "Ocorreu um erro durante a atualização das permissões" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "Editar" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "Grupo de repositórios %s criado" + +#: rhodecode/apps/admin/views/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" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "Limpar sessões antigas" @@ -263,294 +332,880 @@ msgstr "HG" msgid "SVN" msgstr "SVN" -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "Você não pode editar esse usuário" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "para sempre" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "cinco minutos" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "uma hora" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "um dia" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "um mês" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "Tempo de Vida" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, 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" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "Ocorreu um erro durante a criação do usuário %s" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "Usuário atualizado com sucesso" + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "Ocorreu um erro durante a atualização do usuário %s" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "Usuário excluído com sucesso" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "Ocorreu um erro ao excluir o usuário" + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "Ocorreu um erro durante o salvamento das permissões" + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "Função" -#: rhodecode/apps/admin/views/users.py:217 -#: rhodecode/apps/my_account/views.py:191 +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" msgstr "Token de Autenticação criado com sucesso" -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" msgstr "Token de Autenticação removido com sucesso" -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante o salvamento do email" -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" msgstr "Ocorreu um erro durante o salvamento do IP" -#: rhodecode/apps/admin/views/users.py:393 +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" msgstr "Grupos alterados com sucesso" -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "para sempre" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "cinco minutos" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "uma hora" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "um dia" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "um mês" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "Tempo de Vida" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "Ocorreu um erro durante a criação de um gist" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "Gist %s excluído" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/data_table/_dt_elements.mako:323 +msgid "never" +msgstr "nunca" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 #: rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "Repositórios" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "Grupos" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "diário público" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "diário" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" msgstr "Captcha incorreto" -#: rhodecode/apps/login/views.py:279 +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" msgstr "Você se registrou no RhodeCode com sucesso" -#: rhodecode/apps/login/views.py:315 +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." msgstr "Se este email existir, um link para restaurar a senha foi enviado para ele." -#: rhodecode/apps/login/views.py:321 +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." msgstr "Restauração de senha foi desabilitada." -#: rhodecode/apps/login/views.py:410 +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "O token de restauração informado é inválido" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "Senha restaurada com sucesso, uma nova senha foi enviada para seu e-mail" -#: rhodecode/apps/my_account/views.py:125 +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" msgstr "Ocorreu um erro durante a atualização da senha de usuário" -#: rhodecode/apps/my_account/views.py:132 +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" msgstr "Senha atualizada com sucesso" -#: rhodecode/apps/my_account/views.py:281 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:70 +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "Sua conta foi atualizada com sucesso" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, 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" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "Permissões atualizadas do Grupo de Repositórios" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, 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" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:74 +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "Repositório %s criado de %s" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "Repositório %s bifurcado como %s" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "Repositório %s criado" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "" +"Changing the status of a commit associated with a closed pull request is not" +" allowed" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "" +"Repositories unrelated. Cannot compare commit %(commit1)s from repository " +"%(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "Modificações no repositório %s" + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "%s - feed %s" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "Downloads desabilitados" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "Repositório vazio" + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "Tipo de arquivo desconhecido" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "Conjuntos de mudanças" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "Ramos" + +#: rhodecode/apps/repository/views/repo_files.py:890 +#: rhodecode/model/scm.py:791 rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "Etiquetas" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "Ocorreu um erro ao realizar commit" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "Sem modificações" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "Nenhum nome de arquivo" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "" +"The location specified must be a relative path and must not contain .. in " +"the path" +msgstr "" + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "Compare bifurcação" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Ocorreu um erro ao bifurcar o repositório %s" + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" msgstr "Permissões do repositório atualizadas" +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +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" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "Novo pull request criado com sucesso" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "" +"Pull request updated to \"{source_commit_id}\" with {count_added} added, " +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "Pull request excluído com sucesso" + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" +msgstr "" + #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "Destravado" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "Travado" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "O repositório foi %s" + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "Ocorreu um erro durante o destravamento" + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "Ocorreu um erro ao excluir estatísticas de repositório" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "%s bifurcações excluídas" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "" "Cannot delete `{repo}` it still contains attached forks. Try using " "{delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 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" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "Nada" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "Ocorreu um erro durante o destravamento" - -#: rhodecode/apps/repository/views/repo_summary.py:293 +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "Ocorreu um erro durante a criação do campo" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "Ocorreu um erro durante a remoção do campo" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "Realizado pull de localização remota" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "Ocorreu um erro ao realizar pull de localização remota" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "Configurações de VCS atualizadas" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" msgstr "Ramo" -#: rhodecode/apps/repository/views/repo_summary.py:294 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:295 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "Ramos" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" msgstr "" +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." -msgstr "Configuração para o Apache mad_dav_svn alterada." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "Grupo de usuários %s atualizado" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, 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" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "Grupo de usuários excluído com sucesso" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "Ocorreu um erro durante a exclusão do grupo de usuários" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "O grupo destino não pode ser o mesmo" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "Permissões do Grupo de Usuários atualizadas" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" +msgstr "" #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "Habilitar ou desabilitar este plugin de autenticação" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" msgstr "Habilitado" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication responsecall for this plugin. \n" -"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:49 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" msgstr "Tempo de Vida do Cache de Autenticação" @@ -559,15 +1214,15 @@ msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "Ocorreu um erro ao salvar as configurações do plugin. Por favor, verifique os dados do formulário." -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." msgstr "Configurações de autenticação atualizadas com sucesso." -#: rhodecode/authentication/views.py:177 +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:187 +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." msgstr "" @@ -654,7 +1309,6 @@ msgid "The url of the Jasig CAS REST ser msgstr "" #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "URL" @@ -693,10 +1347,11 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Senha" @@ -787,7 +1442,7 @@ msgstr "" msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:365 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" msgstr "" @@ -820,476 +1475,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "" - -#: rhodecode/controllers/changeset.py:343 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "" - -#: rhodecode/controllers/changeset.py:387 -msgid "" -"Changing the status of a commit associated with a closed pull request is not" -" allowed" -msgstr "" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "" -"Repositories unrelated. Cannot compare commit %(commit1)s from repository " -"%(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "Modificações no repositório %s" - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "%s - feed %s" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "" - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "Ocorreu um erro ao realizar commit" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -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" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "Sem modificações" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "Nenhum nome de arquivo" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "" -"The location specified must be a relative path and must not contain .. in " -"the path" -msgstr "" - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "Downloads desabilitados" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "Revisão desconhecida %s" - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "Repositório vazio" - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "Tipo de arquivo desconhecido" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "Conjuntos de mudanças" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "Etiquetas" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "Ocorreu um erro ao bifurcar o repositório %s" - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "diário público" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "diário" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:216 -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" - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "Novo pull request criado com sucesso" - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:346 -msgid "" -"Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "Pull request excluído com sucesso" - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "Configurações padrão atualizadas com sucesso" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "Ocorreu um erro durante a criação de um gist" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "Gist %s excluído" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -msgid "never" -msgstr "nunca" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "" - -#: rhodecode/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" - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "Sua conta foi atualizada com sucesso" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "Ocorreu um erro durante a atualização do usuário %s" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "Ocorreu um erro durante a atualização das permissões" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "Grupo de repositórios %s criado" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, 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" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "Grupo de repositórios %s atualizado" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, 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" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "Grupo de repositórios %s excluído" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, 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" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "Permissões atualizadas do Grupo de Repositórios" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "Erro ao criar repositório %s" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "Repositório %s criado de %s" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "Repositório %s bifurcado como %s" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "Repositório %s criado" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "Ocorreu um erro durante a criação do campo" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "Ocorreu um erro durante a remoção do campo" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "Destravado" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "Travado" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "O repositório foi %s" - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "Realizado pull de localização remota" - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "Ocorreu um erro ao realizar pull de localização remota" - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "Ocorreu um erro ao excluir estatísticas de repositório" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "" - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "Configurações de VCS atualizadas" - #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" @@ -1340,205 +1525,59 @@ msgstr "" msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, 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" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "Grupo de usuários %s atualizado" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, 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" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "Grupo de usuários excluído com sucesso" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "Ocorreu um erro durante a exclusão do grupo de usuários" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "O grupo destino não pode ser o mesmo" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "Permissões do Grupo de Usuários atualizadas" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "Ocorreu um erro durante o salvamento das permissões" - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "Ocorreu um erro durante a criação do usuário %s" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "Usuário atualizado com sucesso" - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "Usuário excluído com sucesso" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "Ocorreu um erro ao excluir o usuário" - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:396 -msgid "" -"The user participates as reviewer in pull requests and cannot be deleted. " -"You can set the user to \"inactive\" instead of deleting it." -msgstr "" - -#: rhodecode/controllers/admin/users.py:462 -msgid "User global permissions updated successfully" -msgstr "" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:166 +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "" @@ -1574,54 +1613,60 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 -#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "Limpar" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1660,28 +1705,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1765,17 +1810,19 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1811,132 +1858,158 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:166 -msgid "" -"URL of the webhook to receive POST event. Following variables are allowed to" -" be used: {vars}. Some of the variables would trigger multiple calls, like " +#: rhodecode/integrations/types/webhook.py:179 +msgid "" +"URL to which Webhook should submit data. Following variables are allowed to " +"be used: {vars}. Some of the variables would trigger multiple calls, like " "${{branch}} or ${{commit_id}}. Webhook will be called as many times as " "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "" +"Optional string used to validate received payloads. It will be sent together" +" with event data in JSON" msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "[baixado] archive do repositório" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "usuário [criado]" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "usuário [atualizado]" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "[criado] grupo de usuários" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "[atualizado] grupo de usuários" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "[comentado] no pull request para" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "[fechado] pull request para" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:148 +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "[commitado via RhodeCode] no repositório" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "[pulled do remote] no repositório" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "nome da bifurcação %s" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1947,52 +2020,42 @@ msgstr "Pull request #%s" msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "Excluído ramo: %s" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "Tag criada: %s" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1220 +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "IP %s não permitido" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 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" -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "" - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "" - #: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" @@ -2010,20 +2073,11 @@ msgstr "Conjunto de mudanças é grande demais e foi cortado, use o menu de diferenças para ver as diferenças" msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr " e mais %s" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "Nenhum Arquivo" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2043,7 +2097,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2057,54 +2111,54 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, 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" -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "agora há pouco" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2121,24 +2175,25 @@ msgstr "agora há pouco" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 +#: rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "Nenhum acesso ao repositório" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2155,24 +2210,25 @@ msgstr "Nenhum acesso ao repositório" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 +#: rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "Acesso de leitura ao repositório" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2189,24 +2245,25 @@ msgstr "Acesso de leitura ao repositório" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 +#: rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "Acesso de escrita ao repositório" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2223,48 +2280,49 @@ msgstr "Acesso de escrita ao repositório" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/model/db.py:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 +#: rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "Acesso administrativo ao repositório" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "Nenhum acesso ao Grupo de Repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "Acesso de leitura ao Grupo de Repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "Acesso de escrita ao Grupo de Repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "Acesso administrativo ao Grupo de Repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2280,7 +2338,7 @@ msgstr "Acesso administrativo ao Grupo de Repositórios" msgid "RhodeCode Administrator" msgstr "Administrador do RhodeCode" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2297,24 +2355,25 @@ msgstr "Administrador do RhodeCode" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 +#: rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "Criação de repositórios desabilitada" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2331,24 +2390,25 @@ msgstr "Criação de repositórios desabilitada" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/model/db.py:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 +#: rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "Criação de repositórios habilitada" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2365,24 +2425,25 @@ msgstr "Criação de repositórios habilitada" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 -#: rhodecode/model/db.py:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 +#: rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "Bifurcação de repositórios desabilitada" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2399,45 +2460,46 @@ msgstr "Bifurcação de repositórios desabilitada" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 +#: rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "Bifurcação de repositórios habilitada" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "Registro desabilitado" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "Registro de novo usuário no RhodeCode com ativação manual" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "Registro de novo usuário no RhodeCode com auto-ativação" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2454,24 +2516,25 @@ msgstr "Registro de novo usuário no RhodeCode com auto-ativação" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 -#: rhodecode/model/db.py:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 +#: rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "Não Revisado" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2488,24 +2551,25 @@ msgstr "Não Revisado" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 -#: rhodecode/model/db.py:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 +#: rhodecode/model/db.py:3325 msgid "Approved" msgstr "Aprovado" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2522,24 +2586,25 @@ msgstr "Aprovado" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 -#: rhodecode/model/db.py:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 +#: rhodecode/model/db.py:3326 msgid "Rejected" msgstr "Rejeitado" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2556,20 +2621,21 @@ msgstr "Rejeitado" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 -#: rhodecode/model/db.py:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 +#: rhodecode/model/db.py:3327 msgid "Under Review" msgstr "Sob Revisão" @@ -2587,20 +2653,21 @@ msgstr "Sob Revisão" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 +#: rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "Sem acesso ao grupo de repositórios" @@ -2618,20 +2685,21 @@ msgstr "Sem acesso ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 +#: rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "Acesso de leitura ao grupo de repositórios" @@ -2649,20 +2717,21 @@ msgstr "Acesso de leitura ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 +#: rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "Acesso de escrita ao grupo de repositórios" @@ -2680,20 +2749,21 @@ msgstr "Acesso de escrita ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/model/db.py:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 +#: rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "Acesso administrativo ao grupo de repositórios" @@ -2710,20 +2780,21 @@ msgstr "Acesso administrativo ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 +#: rhodecode/model/db.py:2605 msgid "User group no access" msgstr "Sem acesso ao grupo de usuários" @@ -2740,20 +2811,21 @@ msgstr "Sem acesso ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/model/db.py:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 +#: rhodecode/model/db.py:2606 msgid "User group read access" msgstr "Acesso de leitura ao grupo de usuários" @@ -2770,20 +2842,21 @@ msgstr "Acesso de leitura ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 +#: rhodecode/model/db.py:2607 msgid "User group write access" msgstr "Acesso de escrita ao grupo de usuários" @@ -2800,20 +2873,21 @@ msgstr "Acesso de escrita ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 +#: rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "Acesso administrativo ao grupo de usuários" @@ -2830,20 +2904,21 @@ msgstr "Acesso administrativo ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 +#: rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "Criação de Grupo de Repositórios desatilibada" @@ -2860,20 +2935,21 @@ msgstr "Criação de Grupo de Repositórios desatilibada" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 +#: rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "Criação de Grupo de Repositórios habilitada" @@ -2890,20 +2966,21 @@ msgstr "Criação de Grupo de Repositórios habilitada" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 +#: rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "Criação de Grupo de Usuários desabilitada" @@ -2920,20 +2997,21 @@ msgstr "Criação de Grupo de Usuários desabilitada" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 +#: rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "Criação de Grupo de Usuários habilitada" @@ -2950,20 +3028,21 @@ msgstr "Criação de Grupo de Usuários habilitada" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/model/db.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 +#: rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "Registro desatilitado" @@ -2980,20 +3059,21 @@ msgstr "Registro desatilitado" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 -#: rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 +#: rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" @@ -3010,20 +3090,21 @@ msgstr "Registro de Usuário com ativação manual de conta" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 +#: rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" @@ -3040,20 +3121,21 @@ msgstr "Registro de Usuário com ativação automática de conta" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 -#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 +#: rhodecode/model/db.py:2632 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" @@ -3070,20 +3152,21 @@ msgstr "Ativação manual de conta externa" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 -#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 +#: rhodecode/model/db.py:2633 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "Ativação automática de conta externa" @@ -3094,20 +3177,21 @@ msgstr "Ativação automática de conta externa" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 +#: rhodecode/model/db.py:2618 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3119,20 +3203,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 +#: rhodecode/model/db.py:2619 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3141,79 +3226,74 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 +#: rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 +#: rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 -#: rhodecode/model/db.py:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "" - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 -#: rhodecode/model/db.py:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 +#: rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 -msgid "all" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 +#: rhodecode/model/db.py:1099 +msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 @@ -3222,8 +3302,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 +#: rhodecode/model/db.py:1100 +msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 @@ -3232,8 +3314,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 +#: rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 @@ -3242,36 +3326,54 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 +#: rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 +#: rhodecode/model/db.py:1103 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 -#: rhodecode/model/db.py:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 +#: rhodecode/model/db.py:2356 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 -#: rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 +#: rhodecode/model/db.py:2628 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/model/db.py:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 +#: rhodecode/model/db.py:2629 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/model/db.py:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 +#: rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3307,112 +3409,128 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:374 -msgid "made a comment" +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" msgstr "" #: rhodecode/model/comment.py:375 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "Por favor entre um login" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Entre um valor com %(min)i caracteres ou mais" -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "Por favor entre com uma senha" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entre com %(min)i caracteres ou mais" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 +#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 +#: rhodecode/model/permission.py:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "Nenhum" -#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 -#: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 +#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 +#: rhodecode/model/permission.py:81 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "Ler" -#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 -#: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3420,8 +3538,8 @@ msgstr "Ler" msgid "Write" msgstr "Gravar" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3435,7 +3553,7 @@ msgstr "Gravar" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3450,189 +3568,189 @@ msgstr "Gravar" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "Administrador" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "Desabilitado" -#: rhodecode/model/permission.py:86 +#: rhodecode/model/permission.py:87 msgid "Allowed with manual account activation" msgstr "Permitido com ativação manual de conta" -#: rhodecode/model/permission.py:87 +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "Permitido com ativação automática de conta" -#: rhodecode/model/permission.py:90 +#: rhodecode/model/permission.py:91 msgid "Allow password recovery" msgstr "" -#: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" -msgstr "" - #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:119 +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:121 +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:123 +#: rhodecode/model/pull_request.py:122 msgid "" "Pull request cannot be updated because the reference type is not supported " "for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:126 +#: rhodecode/model/pull_request.py:125 msgid "" "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:129 +#: rhodecode/model/pull_request.py:128 msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "" - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 -msgid "Server-side pull request merging is disabled." -msgstr "" - -#: rhodecode/model/pull_request.py:1154 -msgid "This pull request is closed." -msgstr "" - #: rhodecode/model/pull_request.py:1166 +msgid "Server-side pull request merging is disabled." +msgstr "" + +#: rhodecode/model/pull_request.py:1168 +msgid "This pull request is closed." +msgstr "" + +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "Marcadores" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "Ramos Fechados" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "tip mais recente" @@ -3640,32 +3758,32 @@ msgstr "tip mais recente" 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" -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 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" -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "" -#: rhodecode/model/user.py:519 +#: rhodecode/model/user.py:523 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "" -#: rhodecode/model/user.py:528 +#: rhodecode/model/user.py:532 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3717,8 +3835,8 @@ msgstr "Nome inválido de grupo de usuários" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "O grupo de usuários \"%(usergroup)s\" já existe" +msgid "User group `%(usergroup)s` already exists" +msgstr "" #: rhodecode/model/validators.py:226 msgid "" @@ -3964,27 +4082,27 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "" "You do not have the permission to store repository groups in the root " "location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4024,440 +4142,454 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Enviando..." -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "Carregando..." -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Nenhum arquivo encontrado" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Link da seleção" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Parar de seguir" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Passar a seguir este repositório" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Seguir" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "Mostrar mais" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" @@ -4470,7 +4602,7 @@ msgstr "Adicionar outro comentário" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" @@ -4478,141 +4610,159 @@ msgstr "" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this " +"page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No branches available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No gists available yet." +msgid "No bookmarks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" -msgstr "Crie novo pull request" +msgid "No user groups available yet." +msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 +msgid "Open new pull request" +msgstr "Crie novo pull request" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "Enviar" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Updating..." +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "" +"There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "desabilitado" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "arquivos" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" msgstr "" @@ -4648,13 +4798,14 @@ msgstr "Painel de Controle" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "filtro rápido..." @@ -4686,19 +4837,19 @@ msgid "Edit Repository Group" msgstr "" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4708,12 +4859,15 @@ msgid "Name" msgstr "Nome" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4721,13 +4875,15 @@ msgstr "Nome" #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4735,48 +4891,51 @@ msgstr "Nome" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "Descrição" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "Última Alteração" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "Dono" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "Última Alteração" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4793,7 +4952,7 @@ msgid "Home" msgstr "Início" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Entrar" @@ -4907,6 +5066,70 @@ msgstr "" msgid "Create Account" msgstr "" +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "Data" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "Ação" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "Repositório" + #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 msgid "Admin audit logs" @@ -4917,68 +5140,34 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "filtro" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:68 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "Ação" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "Repositório" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "Data" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" msgstr "Ainda não há ações" @@ -5016,13 +5205,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -5050,21 +5239,21 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 -#: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Tipo" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -5119,7 +5308,7 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "" @@ -5130,15 +5319,15 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "Cancelar" -#: rhodecode/templates/admin/gists/edit.mako:122 +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " @@ -5171,7 +5360,7 @@ msgid "All Public Gists" msgstr "" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" msgstr "" @@ -5196,14 +5385,14 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5212,6 +5401,7 @@ msgid "Author" msgstr "Autor" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5220,7 +5410,7 @@ msgid "Created on" msgstr "Criado em" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "Expira" @@ -5254,44 +5444,33 @@ msgstr "" msgid "Gist" msgstr "Gist" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:56 -#: rhodecode/templates/admin/integrations/list.mako:204 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:60 -#: rhodecode/templates/data_table/_dt_elements.mako:118 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#: rhodecode/templates/data_table/_dt_elements.mako:193 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "Editar" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "criado" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "Mostrar original" @@ -5304,7 +5483,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "" @@ -5317,7 +5496,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 #: rhodecode/templates/base/base.mako:84 -#: rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Configurações" @@ -5339,67 +5518,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "Todos" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:115 -msgid "No {type} integrations for repo {repo} exist yet." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:117 -msgid "No {type} integrations for repogroup {repogroup} exist yet." -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:119 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:121 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5415,12 +5594,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "Minha conta" @@ -5439,26 +5618,35 @@ msgstr "" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/my_account/my_account.mako:40 msgid "Watched" msgstr "Seguindo" -#: rhodecode/templates/admin/my_account/my_account.mako:40 -#: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:241 +#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 msgid "Pull Requests" msgstr "Pull Requests" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5467,7 +5655,7 @@ msgstr "Pull Requests" msgid "Permissions" msgstr "Permissões" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5517,16 +5705,23 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "Adicionar" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5618,11 +5813,11 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5631,7 +5826,7 @@ msgstr "" msgid "Title" msgstr "Título" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5640,41 +5835,97 @@ msgstr "" msgid "Repositories You Own" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "Criado" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "" +"SSH Keys usage is currently disabled, please ask your administrator to " +"enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "" +"Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-" +"sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "Ainda não há notificações aqui" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "Mostrar notificação" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "Minhas Notificações" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 +msgid "Mark all as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 msgid "Comments" msgstr "Comentários" -#: rhodecode/templates/admin/notifications/notifications.mako:37 -msgid "Mark all as read" -msgstr "" - -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "Ainda não há notificações aqui" - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "Mostrar notificação" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "Notificações" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5692,6 +5943,10 @@ msgid "IP Whitelist" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "" @@ -5732,32 +5987,45 @@ msgstr "" msgid "External Authentication Account Activation" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "Confirme para excluir este IP: %s" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "Todos os endereços IP são permitidos" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5812,6 +6080,14 @@ 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" msgid "Default User Permissions Overview" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "Adicionar grupo de repositórios" @@ -5828,16 +6104,21 @@ msgstr "Grupo de repositórios" msgid "Group Name" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "" @@ -5853,7 +6134,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "" @@ -5882,20 +6163,6 @@ msgstr "" msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" @@ -5905,64 +6172,64 @@ msgstr "" msgid "Delete this repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "dono" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "Adicionar novo" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." @@ -5973,19 +6240,23 @@ msgstr "" msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "Progenitor do grupo" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " @@ -6000,7 +6271,7 @@ msgstr "Administração de grupos de repositórios" msgid "repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "" @@ -6017,51 +6288,51 @@ msgstr "" msgid "Clone from" msgstr "Clonar de" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -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." - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "" +"Plain text format with support of {metatags}. Add a README file for longer " +"descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:79 -msgid "Set the type of repository to create." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" +msgid "{} Creating repository" msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 @@ -6093,7 +6364,7 @@ msgid "Remote" msgstr "Remoto" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "Estatísticas" @@ -6202,7 +6473,7 @@ msgid "Delete forks" msgstr "Excluir bifurcações" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Confirma excluir esse repositório: %s" @@ -6227,6 +6498,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6265,7 +6545,7 @@ msgstr "Chave" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 @@ -6453,8 +6733,8 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "Grupo de repositórios" @@ -6472,9 +6752,9 @@ msgid "Remote uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "editar" @@ -6509,32 +6789,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "Mudar o dono desse repositório." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "Repositório privado" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "Habilitar estatísticas" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "Habilitar janela de estatísticas na página de sumário." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "Habilitar downloads" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "Habilitar menu de descarregar na página de sumário." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -6629,7 +6909,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "Salvar configurações" @@ -6729,7 +7009,7 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6914,6 +7194,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6971,10 +7260,6 @@ msgid "" "custom size" msgstr "" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7043,97 +7328,97 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:66 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +"Parses meta tags from repository or repository group description fields and " +"turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "" "Number of items displayed in the main page dashboard before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:117 +#: rhodecode/templates/admin/settings/settings_visual.mako:106 msgid "Commit ID Style" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:121 +#: rhodecode/templates/admin/settings/settings_visual.mako:110 msgid "Commit sha length" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:128 +#: rhodecode/templates/admin/settings/settings_visual.mako:117 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "Ícones" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "Mostrar ícone de repositório público nos repositórios" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "Mostrar ícone de repositório privado nos repositórios" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "" "Default renderer used to render comments, pull request descriptions and " "other description elements. After change old entries will still work " "correctly." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -7143,11 +7428,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7188,17 +7473,17 @@ msgid "%s user group settings" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "Membros" @@ -7215,54 +7500,59 @@ msgstr "" msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 -msgid "This group is set to be automatically synchronised." -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 +msgid "This group is set to be automatically synchronised." +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "" "Users will be added or removed from this group when they authenticate with " "RhodeCode system, based on LDAP group membership. This requires `LDAP+User " "group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, python-format msgid "" "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "" @@ -7296,7 +7586,7 @@ msgstr "Administração de grupos de usuários" msgid "user groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7336,7 +7626,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7367,16 +7657,12 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "User Groups Management" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" +msgid "User Groups Management" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 @@ -7390,107 +7676,91 @@ msgstr "Último login" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "" "When this is enabled user will have to change they password when they next " "use RhodeCode system. This will also forbid vcs operations until someone " "makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 msgid "Users personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "Confirma excluir este usuário: %s" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "" "When selecting the detach option, the depending objects owned by this user " @@ -7502,10 +7772,6 @@ msgstr "" msgid "User Audit Logs" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 -msgid "audit filter..." -msgstr "" - #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" @@ -7524,10 +7790,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7584,6 +7846,29 @@ msgstr "" msgid "Help translate %(rc_link)s into your language." msgstr "" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "" +"Below is a 2048 bit generated SSH RSA key. You can use it to access " +"RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" msgstr "Administração de usuários" @@ -7625,141 +7910,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: rhodecode/templates/base/base.mako:228 -#: rhodecode/templates/data_table/_dt_elements.mako:12 -#: rhodecode/templates/data_table/_dt_elements.mako:13 -#: rhodecode/templates/data_table/_dt_elements.mako:153 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "Sumário" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "Registro de alterações" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Arquivos" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Compare" -#: rhodecode/templates/base/base.mako:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostrar Pull Requests para %s" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "Opções" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "Compare bifurcação" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "Comparar bifurcação com %s" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Pesquisar" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "Destravar" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "Travar" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "Bifurcação" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "Diário" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "Diário" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:400 msgid "Public journal" msgstr "Diário público" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:405 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:401 +#: rhodecode/templates/base/base.mako:406 msgid "Gists" msgstr "Gists" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7781,15 +8066,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "" @@ -7899,9 +8184,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "Visualizar" @@ -7909,77 +8194,94 @@ msgstr "Visualizar" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "mostrar" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "nenhum" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "ler" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "escrever" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "administrador" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "Permissão" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "Editar Permissão" -#: rhodecode/templates/base/perms_summary.mako:85 -msgid "Super admin" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:87 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 msgid "Repository default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:88 +#: rhodecode/templates/base/perms_summary.mako:120 msgid "Repository group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:89 +#: rhodecode/templates/base/perms_summary.mako:123 msgid "User group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:126 +msgid "Super admin" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "Criar repositórios" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "Bufurcar repositórios" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "Criar grupos de usuários" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8102,93 +8404,74 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "" -"These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "" -"Use rebase instead of creating a merge commit when merging via web " -"interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "" "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -8196,16 +8479,40 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." msgstr "" +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "" +"Use rebase instead of creating a merge commit when merging via web " +"interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "" +"Close branch before merging it into destination branch. No effect when " +"rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -8220,8 +8527,8 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -8242,8 +8549,8 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -8255,55 +8562,54 @@ msgstr "Ramo %s" msgid "%s Changelog" msgstr "%s Changelog" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "Comparar bifurcação com %s" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "Deselecionar seleção" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "Idade" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "Ainda não há alteações" @@ -8321,8 +8627,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8335,43 +8640,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "mesclar" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8379,7 +8689,7 @@ msgstr "mesclar" msgid "Tag %s" msgstr "Tag %s" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8392,102 +8702,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 +#: rhodecode/templates/changeset/changeset.mako:142 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "Diff cru" -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:143 msgid "Raw Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:143 +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "D" -#: rhodecode/templates/changeset/changeset.mako:144 +#: rhodecode/templates/changeset/changeset.mako:147 msgid "Patch Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:147 +#: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "Baixar diff" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8557,12 +8849,12 @@ msgid "Leave a comment on this Commit." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Entrar agora" @@ -8582,7 +8874,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Fechado" @@ -8600,15 +8892,8 @@ msgstr "Comentário" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8620,31 +8905,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8652,8 +8919,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -8661,8 +8928,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" msgstr "Mostrar diff completo" @@ -8675,68 +8942,50 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "" -"%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:118 +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "Nenhum arquivo" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "" +"This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "" -"This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:415 #: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format @@ -8795,7 +9044,7 @@ msgstr "" msgid "Wide Mode Diff" msgstr "" -#: rhodecode/templates/codeblocks/source.mako:24 +#: rhodecode/templates/codeblocks/source.mako:25 msgid "view annotation from before this change" msgstr "" @@ -8808,25 +9057,11 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" msgstr "" @@ -8836,13 +9071,6 @@ msgstr "" msgid "%s Compare" msgstr "%s Comparar" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 @@ -8856,14 +9084,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "" @@ -8887,72 +9115,69 @@ msgstr "" msgid "Compare commits, branches, bookmarks or tags." msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:49 +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "Repositório Mercurial" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "Repositório Git" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "Repositório público" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "Assinar o feed rss de %s" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "Assinar o feed atom de %s" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "Criado" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, 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] "Confirme para excluir este grupo: %s com %s repositório" -msgstr[1] "Confirme para excluir este grupo: %s com %s repositórios" - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Confirme para excluir este grupo de usuário: %s" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "Grupo de usuários" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "Privado" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" @@ -9254,13 +9479,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -9276,13 +9494,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9318,13 +9529,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9392,22 +9596,22 @@ msgid "Create New File" msgstr "" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "Realizar commit das alterações" @@ -9462,15 +9666,15 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "Arquivo binário (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" -msgstr "Arquivo é grande demais para exibir" +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " +msgstr "" #: rhodecode/templates/files/files_delete.mako:70 msgid "Delete File" @@ -9519,15 +9723,15 @@ msgstr "fonte" msgid "annotation" msgstr "anotação" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" msgstr "" -#: rhodecode/templates/files/files_edit.mako:74 +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "Editando arquivo" @@ -9535,62 +9739,55 @@ msgstr "Editando arquivo" msgid "Location" msgstr "Local" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 -msgid "Annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 -msgid "Raw" -msgstr "" - #: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 +msgid "Annotation" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 +msgid "Raw" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Download" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9604,22 +9801,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "Nome da bifurcação" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "Copiar permissões" -#: rhodecode/templates/forks/fork.mako:97 +#: rhodecode/templates/forks/fork.mako:102 msgid "Copy permissions from forked repository" msgstr "Copiar permissões do repositório bifurcado" -#: rhodecode/templates/forks/fork.mako:102 +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "" @@ -9632,34 +9830,23 @@ msgstr "%s Bifurcações" msgid "Forks" msgstr "Bifurcações" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "Bifurcado" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "Ainda não há bifurcações" - -#: rhodecode/templates/journal/journal.mako:13 +#: rhodecode/templates/journal/journal.mako:14 msgid "Filter" msgstr "" -#: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "%s entrada" -msgstr[1] "%s entradas" - -#: rhodecode/templates/journal/journal.mako:23 +#: rhodecode/templates/journal/journal.mako:24 msgid "ATOM journal feed" msgstr "ATOM feed do diário" -#: rhodecode/templates/journal/journal.mako:24 +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "RSS feed do diário" @@ -9668,15 +9855,15 @@ msgid "No entries yet" msgstr "Ainda não há entradas" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "Diário Público" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "ATOM feed do diário público" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "RSS feed do diário público" @@ -9706,22 +9893,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "Revisores do pull request" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9734,13 +9921,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" -msgstr[1] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9765,26 +9945,26 @@ msgstr "" msgid "Merge is not currently possible because of below failed checks." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9805,171 +9985,175 @@ msgstr "Confirme para excluir este pull msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 -#, python-format -msgid "calculated based on %s reviewer vote" -msgid_plural "calculated based on %s reviewers votes" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 -msgid "{} version available for this pull request, show it." -msgid_plural "{} versions available for this pull request, show them." -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 -#, python-format -msgid "%d General " -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 +msgid "Mandatory reviewer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "" "These commits cannot be displayed, because this repository uses the " "Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 msgid "" "This pull request cannot be displayed, because one or more commits no longer" " exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 msgid "" "Please update this pull request, push the commits back into the source " "repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 msgid "" "Commits and changes between v{ver_from} and {ver_to} of this pull request, " "commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -10072,7 +10256,7 @@ msgstr "" msgid "Age (old first)" msgstr "" -#: rhodecode/templates/search/search_content.mako:33 +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "" @@ -10080,84 +10264,74 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "%s Sumário" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "%s ATOM feed" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "%s RSS feed" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 -msgid "Show by Name" -msgstr "Mostrar por Nome" - -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 -msgid "Show by ID" -msgstr "Mostrar por ID" - -#: rhodecode/templates/summary/components.mako:56 -msgid "SVN Protocol is disabled. To enable it, see the" -msgstr "" - #: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 +msgid "Show by Name" +msgstr "Mostrar por Nome" + +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 +msgid "Show by ID" +msgstr "Mostrar por ID" + +#: rhodecode/templates/summary/components.mako:61 +msgid "SVN Protocol is disabled. To enable it, see the" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "URL de clonagem" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "Ainda não há downloads" -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" msgstr "" @@ -10175,6 +10349,21 @@ msgstr "Início rápido" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "%s Sumário" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "%s ATOM feed" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "%s RSS feed" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" msgstr "" diff --git a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po @@ -9,7 +9,7 @@ # Alexander Litvinov , 2013 # Invision , 2014 # Ivlev Denis , 2013 -# Ivlev Denis , 2013-2015 +# Ivlev Denis , 2013-2015,2017 # Mikhail Zholobov , 2013 # Mikhail Zholobov , 2013 # Andre , 2013 @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-27 17:25+0200\n" -"PO-Revision-Date: 2017-06-27 15:26+0000\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" +"PO-Revision-Date: 2017-11-03 15:43+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Russian (http://www.transifex.com/rhodecode/RhodeCode/language/ru/)\n" "MIME-Version: 1.0\n" @@ -39,7 +39,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" @@ -107,17 +107,86 @@ msgid "System Info" msgstr "" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" +msgid "Processes" msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "Стандартные настройки успешно обновлены" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "Произошла ошибка во время обновления привилегий" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "Глобальные привилегии успешно обновлены" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "Редактировать" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "Создана новая группа репозиториев %s" + +#: rhodecode/apps/admin/views/repo_groups.py:198 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "Произошла ошибка при создании группы репозиториев %s" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "" @@ -280,272 +349,858 @@ msgstr "" msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "Вы не можете редактировать данного пользователя" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "навсегда" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "5 минут" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "1 час" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "1 день" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "1 месяц" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "Срок" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "Произошла ошибка при создании группы пользователей %s" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "Произошла ошибка при создании пользователя %s" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "Пользователь успешно обновлён" + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "Произошла ошибка при обновлении пользователя %s" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "Пользователь успешно удалён" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "Произошла ошибка при удалении пользователя" + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "Произошла ошибка при сохранении привилегий" + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "" -#: rhodecode/apps/admin/views/users.py:217 -#: rhodecode/apps/my_account/views.py:191 +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "Произошла ошибка при сохранении E-mail" -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" msgstr "Произошла ошибка при сохранении IP" -#: rhodecode/apps/admin/views/users.py:393 +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" msgstr "IP %s удален из белого списка пользователя" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "навсегда" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "5 минут" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "1 час" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "1 день" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "1 месяц" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "Срок" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "Произошла ошибка во время создания сути" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "Запись gist %s удалена" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/data_table/_dt_elements.mako:323 +msgid "never" +msgstr "никогда" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 #: rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "Репозитории" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "Группы" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "общедоступный журнал" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "журнал" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:279 +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" msgstr "Регистрация в RhodeCode прошла успешно" -#: rhodecode/apps/login/views.py:315 +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:321 +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:410 +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "Сброс пароля прошел успешно, новый пароль отправлен на ваш адрес электронной почты" -#: rhodecode/apps/my_account/views.py:125 +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views.py:132 +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views.py:281 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:70 +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "Ваша учетная запись успешно обновлена" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "Произошла ошибка при удалении группы репозиториев %s" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "Привилегии группы репозиториев обновлены" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "Произошла ошибка при обновлении группы репозиториев %s" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:74 +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "Произошла ошибка при очистке кэша" -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "Ещё не было коммитов" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "Репозиторий %s создан из %s" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "Сделан форк(копия) репозитория %s на %s" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "Репозиторий %s создан" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "Показывать пробел" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "Всегда показывать пробел при сравнении файлов" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "Игнорировать пробел" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "Всегда игнорировать пробел при сравнении файлов" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "Выделять несовпадения увеличением текста" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "Всегда выделять несовпадения увеличением текста при сравнении файлов" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "Изменить статус %(transition_icon)s %(status)s" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "" +"Changing the status of a commit associated with a closed pull request is not" +" allowed" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "" +"Repositories unrelated. Cannot compare commit %(commit1)s from repository " +"%(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "Изменения в репозитарии %s" + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "Лента новостей %s %s" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "Репозиторий заблокировал %s в %s" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "Файлов пока нет. %s" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "Возможность скачивать отключена" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "Пустой репозитарий" + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "Неизвестный тип архива" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "Набор изменений" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "Ветки" + +#: rhodecode/apps/repository/views/repo_files.py:890 +#: rhodecode/model/scm.py:791 rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "Метки" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "Во время фиксации изменений произошла ошибка" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "Без изменений" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "Файл добавлен с помощью RhodeCode Enterprise" + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "Безымянный" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "" +"The location specified must be a relative path and must not contain .. in " +"the path" +msgstr "Указанное расположение должно быть релятивным и не должно содержать \"..\" в имени пути" + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "Сравнить форк" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Произошла ошибка во время создания форка репозитория %s" + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" msgstr "Привилегии репозитория обновлены" +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +msgid "Pull request requires a title with min. 3 chars" +msgstr "Заголовок Pull запроса должен быть не менее 3-х символов" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "Pull запрос создан успешно" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "Не могу обновить закрытые запросы на включение изменений." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "Заголовок и описание запроса на включение изменений обновлены." + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "" +"Pull request updated to \"{source_commit_id}\" with {count_added} added, " +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "Pull запрос успешно удалён" + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" +msgstr "" + #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "Разблокировано" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "Заблокировано" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "Репозиторий %s" + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "Произошла ошибка во время разблокирования" + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "Произошла ошибка при удалении статистики репозитория" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "Форки %s отсоединены" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "Удалены форки репозитория %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "" "Cannot delete `{repo}` it still contains attached forks. Try using " "{delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "Видимость репозитория в публичном журнале обновлена" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 msgid "An error occurred during setting this repository in public journal" msgstr "Произошла ошибка при установке репозитария в общедоступный журнал" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "Ничего" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Репозиторий %s отмечен как форк %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "Произошла ошибка при выполнении операции" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" msgstr "Закрытый репозиторий" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" msgstr "Открытый репозиторий" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "Произошла ошибка во время разблокирования" - -#: rhodecode/apps/repository/views/repo_summary.py:293 +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "Произошла ошибка при создании поля" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "Произошла ошибка при удалении поля" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "Внесены изменения из удалённого репозитория" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "Произошла ошибка при внесении изменений из удалённого репозитория" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "Обновлены настройки VCS" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" msgstr "Ветка" -#: rhodecode/apps/repository/views/repo_summary.py:294 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" msgstr "Тэги" -#: rhodecode/apps/repository/views/repo_summary.py:295 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" msgstr "Закладки" -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "Ветки" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" msgstr "" +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "Группа пользователей %s обновлена" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "Произошла ошибка при обновлении группы пользователей %s" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "Группа пользователей успешно удалена" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "Произошла ошибка при удалении группы пользователей" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "Целевая группа не может быть такой же" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "Привилегии группы пользователей обновлены" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" msgstr "" #: rhodecode/authentication/schema.py:35 @@ -553,21 +1208,21 @@ msgid "Enable or disable this authentica msgstr "" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" msgstr "Включено" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication responsecall for this plugin. \n" -"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:49 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" msgstr "" @@ -576,15 +1231,15 @@ msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:177 +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:187 +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." msgstr "" @@ -671,7 +1326,6 @@ msgid "The url of the Jasig CAS REST ser msgstr "" #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "URL" @@ -710,10 +1364,11 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Пароль" @@ -804,7 +1459,7 @@ msgstr "" msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:365 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" msgstr "LDAP" @@ -837,480 +1492,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "Ещё не было коммитов" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "Показывать пробел" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "Всегда показывать пробел при сравнении файлов" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "Игнорировать пробел" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "Всегда игнорировать пробел при сравнении файлов" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "Выделять несовпадения увеличением текста" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "Всегда выделять несовпадения увеличением текста при сравнении файлов" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "" - -#: rhodecode/controllers/changeset.py:343 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "Изменить статус %(transition_icon)s %(status)s" - -#: rhodecode/controllers/changeset.py:387 -msgid "" -"Changing the status of a commit associated with a closed pull request is not" -" allowed" -msgstr "" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "" -"Repositories unrelated. Cannot compare commit %(commit1)s from repository " -"%(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "Изменения в репозитарии %s" - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "Лента новостей %s %s" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "" - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "Файлов пока нет. %s" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "Репозиторий заблокировал %s в %s" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "Файлы с новыми версиями можно удалять только из ветки с правом доступа" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "Во время фиксации изменений произошла ошибка" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -msgid "You can only edit files with revision being a valid branch " -msgstr "Вы можете редактировать файлы только в редакции, связанной с существующей веткой" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "Без изменений" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "Файл добавлен с помощью RhodeCode Enterprise" - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "Безымянный" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "" -"The location specified must be a relative path and must not contain .. in " -"the path" -msgstr "Указанное расположение должно быть релятивным и не должно содержать \"..\" в имени пути" - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "Возможность скачивать отключена" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "Неизвестная версия %s" - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "Пустой репозитарий" - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "Неизвестный тип архива" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "Набор изменений" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "Метки" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "Произошла ошибка во время создания форка репозитория %s" - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "общедоступный журнал" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "журнал" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:216 -msgid "Pull request requires a title with min. 3 chars" -msgstr "Заголовок Pull запроса должен быть не менее 3-х символов" - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "Pull запрос создан успешно" - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "Не могу обновить закрытые запросы на включение изменений." - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "Заголовок и описание запроса на включение изменений обновлены." - -#: rhodecode/controllers/pullrequests.py:346 -msgid "" -"Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "Pull запрос успешно удалён" - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "Стандартные настройки успешно обновлены" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "Произошла ошибка во время создания сути" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "Запись gist %s удалена" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -msgid "never" -msgstr "никогда" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:70 -msgid "You can't edit this user since it's crucial for entire application" -msgstr "Вы не можете изменить данные пользователя, поскольку это критично для работы всего приложения" - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "Ваша учетная запись успешно обновлена" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "Произошла ошибка при обновлении пользователя %s" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "Произошла ошибка во время обновления привилегий" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "Глобальные привилегии успешно обновлены" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "Создана новая группа репозиториев %s" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "Произошла ошибка при создании группы репозиториев %s" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "Группа репозиториев %s обновлена" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, python-format -msgid "Error occurred during update of repository group %s" -msgstr "Произошла ошибка при обновлении группы репозиториев %s" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "Группа репозиториев %s удалена" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, python-format -msgid "Error occurred during deletion of repository group %s" -msgstr "Произошла ошибка при удалении группы репозиториев %s" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "Привилегии группы репозиториев обновлены" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "Произошла ошибка при создании репозитория %s" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "Репозиторий %s создан из %s" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "Сделан форк(копия) репозитория %s на %s" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "Репозиторий %s создан" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "Произошла ошибка при создании поля" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "Произошла ошибка при удалении поля" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "Разблокировано" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "Заблокировано" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "Репозиторий %s" - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "Внесены изменения из удалённого репозитория" - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "Произошла ошибка при внесении изменений из удалённого репозитория" - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "Произошла ошибка при удалении статистики репозитория" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "" - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "Обновлены настройки VCS" - #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" @@ -1361,205 +1542,59 @@ msgstr "" msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "Произошла ошибка при создании группы пользователей %s" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "Группа пользователей %s обновлена" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "Произошла ошибка при обновлении группы пользователей %s" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "Группа пользователей успешно удалена" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "Произошла ошибка при удалении группы пользователей" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "Целевая группа не может быть такой же" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "Привилегии группы пользователей обновлены" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "Произошла ошибка при сохранении привилегий" - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "Произошла ошибка при создании пользователя %s" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "Пользователь успешно обновлён" - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "Пользователь успешно удалён" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "Произошла ошибка при удалении пользователя" - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:396 -msgid "" -"The user participates as reviewer in pull requests and cannot be deleted. " -"You can set the user to \"inactive\" instead of deleting it." -msgstr "" - -#: rhodecode/controllers/admin/users.py:462 -msgid "User global permissions updated successfully" -msgstr "" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:166 +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "" @@ -1595,54 +1630,60 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 -#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "Сброс" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1681,28 +1722,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1786,17 +1827,19 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1832,132 +1875,158 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:166 -msgid "" -"URL of the webhook to receive POST event. Following variables are allowed to" -" be used: {vars}. Some of the variables would trigger multiple calls, like " +#: rhodecode/integrations/types/webhook.py:179 +msgid "" +"URL to which Webhook should submit data. Following variables are allowed to " +"be used: {vars}. Some of the variables would trigger multiple calls, like " "${{branch}} or ${{commit_id}}. Webhook will be called as many times as " "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "" +"Optional string used to validate received payloads. It will be sent together" +" with event data in JSON" msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr "[удален] репозиторий" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "[создан] репозиторий" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "[создан] репозиторий как форк" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "[форкнут] репозиторий" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "[обновлён] репозиторий" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "[загружен] архив из репозитория" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "[удален] репозиторий" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "[создан] пользователь" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "[обновлён] пользователь" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "[создана] группа пользователей" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "[обновлена] группа пользователей" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "[прокомментировано] в запросе на внесение изменений для" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "[закрыт] pull запрос для" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:148 +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "[отправлено] в" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "[внесены изменения с помощью RhodeCode] в репозитории" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "[внесены изменения из удалённого репозитория] в репозиторий" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "[внесены изменения] из" -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "[добавлен в наблюдения] репозиторий" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "[удалён из наблюдения] репозиторий" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "имя форка %s" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1968,52 +2037,42 @@ msgstr "Pull запрос #%s" msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "сравнение" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "Удалена ветка: %s" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "Создан тег: %s" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1220 +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблокирован" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 msgid "You need to be a registered user to perform this action" msgstr "Вы должны быть зарегистрированным пользователем, чтобы выполнить это действие" -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "" - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "" - #: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" @@ -2031,20 +2090,11 @@ msgstr "Набор изменения оказался слишком большими и был урезан, используйте меню сравнения для показа результата сравнения" msgid "No changes detected" msgstr "Изменений не обнаружено" -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr "и на %s больше" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "Файлов нет" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2064,7 +2114,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2078,54 +2128,54 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, 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 отсутствует в базе данных; возможно, он был создан или переименован из файловой системы. Пожалуйста, перезапустите приложение для сканирования репозиториев." -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "прямо сейчас" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2142,24 +2192,25 @@ msgstr "прямо сейчас" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 +#: rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "Репозитарий - нет доступа" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2176,24 +2227,25 @@ msgstr "Репозитарий - нет доступа" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 +#: rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "Репозитарий - доступ на чтение" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2210,24 +2262,25 @@ msgstr "Репозитарий - доступ на чтение" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 +#: rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "Репозитарий - доступ на запись" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2244,48 +2297,49 @@ msgstr "Репозитарий - доступ на запись" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/model/db.py:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 +#: rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "Репозитарий - администрирование" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "Группа Репозиториев - нет доступа" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "Группа Репозиториев - доступ на чтение" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "Группа Репозиториев - доступ на запись" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "Группа Репозиториев - администрирование" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2301,7 +2355,7 @@ msgstr "Группа Репозиториев - администрирование" msgid "RhodeCode Administrator" msgstr "Администратор RhodeCode " -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2318,24 +2372,25 @@ msgstr "Администратор RhodeCode " #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 +#: rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "Создание репозиториев отключено" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2352,24 +2407,25 @@ msgstr "Создание репозиториев отключено" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/model/db.py:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 +#: rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "Создание репозиториев включено" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2386,24 +2442,25 @@ msgstr "Создание репозиториев включено" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 -#: rhodecode/model/db.py:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 +#: rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "Возможность создавать форк репозитория отключена" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2420,45 +2477,46 @@ msgstr "Возможность создавать форк репозитория отключена" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 +#: rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "Возможность создавать форк репозитория включена" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "Регистрация отключена" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "Регистрация нового пользователя в RhodeCode с ручной активацией" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "Регистрация нового пользователя в RhodeCode с автоматической активацией" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2475,24 +2533,25 @@ msgstr "Регистрация нового пользователя в RhodeCode с автоматической активацией" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 -#: rhodecode/model/db.py:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 +#: rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "Не просмотрено" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2509,24 +2568,25 @@ msgstr "Не просмотрено" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 -#: rhodecode/model/db.py:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 +#: rhodecode/model/db.py:3325 msgid "Approved" msgstr "Одобрено" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2543,24 +2603,25 @@ msgstr "Одобрено" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 -#: rhodecode/model/db.py:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 +#: rhodecode/model/db.py:3326 msgid "Rejected" msgstr "Отклонено" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2577,20 +2638,21 @@ msgstr "Отклонено" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 -#: rhodecode/model/db.py:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 +#: rhodecode/model/db.py:3327 msgid "Under Review" msgstr "На рассмотрении" @@ -2608,20 +2670,21 @@ msgstr "На рассмотрении" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 +#: rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "Группа репозиториев - нет доступа" @@ -2639,20 +2702,21 @@ msgstr "Группа репозиториев - нет доступа" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 +#: rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "Группа репозиториев - доступ на чтение" @@ -2670,20 +2734,21 @@ msgstr "Группа репозиториев - доступ на чтение" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 +#: rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "Группа репозиториев - доступ на запись" @@ -2701,20 +2766,21 @@ msgstr "Группа репозиториев - доступ на запись" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/model/db.py:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 +#: rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "Группа репозиториев - администрирование" @@ -2731,20 +2797,21 @@ msgstr "Группа репозиториев - администрирование" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 +#: rhodecode/model/db.py:2605 msgid "User group no access" msgstr "Группа пользователей - нет доступа" @@ -2761,20 +2828,21 @@ msgstr "Группа пользователей - нет доступа" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/model/db.py:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 +#: rhodecode/model/db.py:2606 msgid "User group read access" msgstr "Группа пользователей - доступ на чтение" @@ -2791,20 +2859,21 @@ msgstr "Группа пользователей - доступ на чтение" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 +#: rhodecode/model/db.py:2607 msgid "User group write access" msgstr "Группа пользователей - доступ на запись" @@ -2821,20 +2890,21 @@ msgstr "Группа пользователей - доступ на запись" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 +#: rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "Группа пользователей - администрирование" @@ -2851,20 +2921,21 @@ msgstr "Группа пользователей - администрирование" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 +#: rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "Создание групп репозиториев отключено" @@ -2881,20 +2952,21 @@ msgstr "Создание групп репозиториев отключено" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 +#: rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "Создание групп репозиториев включено" @@ -2911,20 +2983,21 @@ msgstr "Создание групп репозиториев включено" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 +#: rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "Создание групп пользователей отключено" @@ -2941,20 +3014,21 @@ msgstr "Создание групп пользователей отключено" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 +#: rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "Создание групп пользователей включено" @@ -2971,20 +3045,21 @@ msgstr "Создание групп пользователей включено" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/model/db.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 +#: rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "Регистрация отключена" @@ -3001,20 +3076,21 @@ msgstr "Регистрация отключена" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 -#: rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 +#: rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "Регистрация пользователя с ручной активацией учётной записи" @@ -3031,20 +3107,21 @@ msgstr "Регистрация пользователя с ручной активацией учётной записи" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 +#: rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией учётной записи" @@ -3061,20 +3138,21 @@ msgstr "Регистрация пользователя с автоматической активацией учётной записи" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 -#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 +#: rhodecode/model/db.py:2632 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "Ручная активация внешней учетной записи" @@ -3091,20 +3169,21 @@ msgstr "Ручная активация внешней учетной записи" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 -#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 +#: rhodecode/model/db.py:2633 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "Автоматическая активация внешней учетной записи" @@ -3115,20 +3194,21 @@ msgstr "Автоматическая активация внешней учетной записи" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 +#: rhodecode/model/db.py:2618 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3140,20 +3220,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 +#: rhodecode/model/db.py:2619 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3162,79 +3243,74 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 +#: rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 +#: rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 -#: rhodecode/model/db.py:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "" - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 -#: rhodecode/model/db.py:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 +#: rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 -msgid "all" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 +#: rhodecode/model/db.py:1099 +msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 @@ -3243,8 +3319,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 +#: rhodecode/model/db.py:1100 +msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 @@ -3253,8 +3331,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 +#: rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 @@ -3263,36 +3343,54 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 +#: rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 +#: rhodecode/model/db.py:1103 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 -#: rhodecode/model/db.py:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 +#: rhodecode/model/db.py:2356 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 -#: rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 +#: rhodecode/model/db.py:2628 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/model/db.py:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 +#: rhodecode/model/db.py:2629 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/model/db.py:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 +#: rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3328,112 +3426,128 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:374 -msgid "made a comment" +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" msgstr "" #: rhodecode/model/comment.py:375 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "Пожалуйста, введите логин" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Введите значение длиной не менее %(min)i символов" -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "Пожалуйста, введите пароль" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "Введите не менее %(min)i символов" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 +#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 +#: rhodecode/model/permission.py:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "Ничего" -#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 -#: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 +#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 +#: rhodecode/model/permission.py:81 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "Чтение" -#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 -#: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3441,8 +3555,8 @@ msgstr "Чтение" msgid "Write" msgstr "Запись" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3456,7 +3570,7 @@ msgstr "Запись" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3471,189 +3585,189 @@ msgstr "Запись" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "Администратор" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "Отключено" -#: rhodecode/model/permission.py:86 +#: rhodecode/model/permission.py:87 msgid "Allowed with manual account activation" msgstr "Разрешена, с ручной активацией учётной записи" -#: rhodecode/model/permission.py:87 +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "Разрешена, с автоматической активацией учётной записи" -#: rhodecode/model/permission.py:90 +#: rhodecode/model/permission.py:91 msgid "Allow password recovery" msgstr "" -#: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" -msgstr "" - #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:119 +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:121 +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:123 +#: rhodecode/model/pull_request.py:122 msgid "" "Pull request cannot be updated because the reference type is not supported " "for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:126 +#: rhodecode/model/pull_request.py:125 msgid "" "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:129 +#: rhodecode/model/pull_request.py:128 msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "" - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 -msgid "Server-side pull request merging is disabled." -msgstr "" - -#: rhodecode/model/pull_request.py:1154 -msgid "This pull request is closed." -msgstr "" - #: rhodecode/model/pull_request.py:1166 +msgid "Server-side pull request merging is disabled." +msgstr "" + +#: rhodecode/model/pull_request.py:1168 +msgid "This pull request is closed." +msgstr "" + +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "Закладки" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "Закрытые ветки" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "последняя версия" @@ -3661,32 +3775,32 @@ msgstr "последняя версия" msgid "You can't Edit this user since it's crucial for entire application" msgstr "Вы не можете редактировать пользователя, поскольку это критично для работы всего приложения" -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 msgid "You can't remove this user since it's crucial for entire application" msgstr "Вы не можете удалить пользователя, поскольку это критично для работы всего приложения" -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "" -#: rhodecode/model/user.py:519 +#: rhodecode/model/user.py:523 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "" -#: rhodecode/model/user.py:528 +#: rhodecode/model/user.py:532 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3738,8 +3852,8 @@ msgstr "Недопустимое имя группы пользователей" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "Группа пользователей \"%(usergroup)s\" уже существует" +msgid "User group `%(usergroup)s` already exists" +msgstr "" #: rhodecode/model/validators.py:226 msgid "" @@ -3985,27 +4099,27 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "" "You do not have the permission to store repository groups in the root " "location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4045,440 +4159,454 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Применение..." -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "Загрузка..." -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Нет совпадений" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Ссылка выбора" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Отменить наблюдение за репозиторием" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Не наблюдать" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Наблюдать за репозиторием" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Наблюдать" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "Показать еще" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" @@ -4491,7 +4619,7 @@ msgstr "Добавить другой комментарий" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" @@ -4499,141 +4627,159 @@ msgstr "" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this " +"page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No branches available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No gists available yet." +msgid "No bookmarks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" -msgstr "Создать новый pull запрос" +msgid "No user groups available yet." +msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 +msgid "Open new pull request" +msgstr "Создать новый pull запрос" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "Отправить" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Updating..." +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "" +"There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "отключено" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "файлы" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "загрузка..." -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" msgstr "" @@ -4669,13 +4815,14 @@ msgstr "Панель управления" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "фильтр..." @@ -4707,19 +4854,19 @@ msgid "Edit Repository Group" msgstr "Изменить группу репозиториев" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4729,12 +4876,15 @@ msgid "Name" msgstr "Имя" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4742,13 +4892,15 @@ msgstr "Имя" #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4756,48 +4908,51 @@ msgstr "Имя" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "Описание" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "Последнее изменение" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "Владелец" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "Последнее изменение" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4814,7 +4969,7 @@ msgid "Home" msgstr "Домой" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Войти" @@ -4869,7 +5024,7 @@ msgstr "" #: rhodecode/templates/password_reset.mako:52 msgid "Email Address" -msgstr "Почтовый адрес" +msgstr "Адрес E-mail" #: rhodecode/templates/password_reset.mako:61 #: rhodecode/templates/register.mako:85 @@ -4928,6 +5083,70 @@ msgstr "" msgid "Create Account" msgstr "" +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "Дата" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "Действие" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "Репозитарий" + #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 msgid "Admin audit logs" @@ -4938,68 +5157,34 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "Отфильтровать" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:68 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "Действие" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "Репозитарий" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "Дата" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" msgstr "Действия ещё не производились" @@ -5037,13 +5222,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -5071,21 +5256,21 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 -#: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "Тип" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -5140,7 +5325,7 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "plain" @@ -5151,15 +5336,15 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "Отмена" -#: rhodecode/templates/admin/gists/edit.mako:122 +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " @@ -5192,7 +5377,7 @@ msgid "All Public Gists" msgstr "" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" msgstr "" @@ -5217,14 +5402,14 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5233,6 +5418,7 @@ msgid "Author" msgstr "Автор" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5241,7 +5427,7 @@ msgid "Created on" msgstr "Создано" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "Истекает" @@ -5275,44 +5461,33 @@ msgstr "" msgid "Gist" msgstr "Gist" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:56 -#: rhodecode/templates/admin/integrations/list.mako:204 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:60 -#: rhodecode/templates/data_table/_dt_elements.mako:118 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#: rhodecode/templates/data_table/_dt_elements.mako:193 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "Редактировать" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "создал" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "Показать без форматирования" @@ -5325,7 +5500,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "Группы репозиториев" @@ -5338,7 +5513,7 @@ msgstr "Группы репозиториев" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 #: rhodecode/templates/base/base.mako:84 -#: rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "Настройки" @@ -5360,67 +5535,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "Всё" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:115 -msgid "No {type} integrations for repo {repo} exist yet." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:117 -msgid "No {type} integrations for repogroup {repogroup} exist yet." -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:119 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:121 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5436,12 +5611,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "Мой аккаунт" @@ -5460,26 +5635,35 @@ msgstr "Профиль" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/my_account/my_account.mako:40 msgid "Watched" msgstr "Просмотрено" -#: rhodecode/templates/admin/my_account/my_account.mako:40 -#: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:241 +#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 msgid "Pull Requests" msgstr "Pull-request'ы" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5488,7 +5672,7 @@ msgstr "Pull-request'ы" msgid "Permissions" msgstr "Привилегии" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5538,16 +5722,23 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "Добавить" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5639,11 +5830,11 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5652,7 +5843,7 @@ msgstr "" msgid "Title" msgstr "Заголовок" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5661,41 +5852,97 @@ msgstr "" msgid "Repositories You Own" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "Создано" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "" +"SSH Keys usage is currently disabled, please ask your administrator to " +"enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "" +"Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-" +"sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "Уведомлений нет" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "Показать уведомление" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "Мои уведомления" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 +msgid "Mark all as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 msgid "Comments" msgstr "Комментарии" -#: rhodecode/templates/admin/notifications/notifications.mako:37 -msgid "Mark all as read" -msgstr "" - -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "Уведомлений нет" - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "Показать уведомление" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "Уведомления" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5713,6 +5960,10 @@ msgid "IP Whitelist" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "Обзор" @@ -5753,32 +6004,45 @@ msgstr "" msgid "External Authentication Account Activation" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "Подтвердите удаление ip %s" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "Разрешены любые IP-адреса" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5833,6 +6097,14 @@ msgstr "Выбранные привилегии будут установлены по умолчанию для каждой группы пользователей. Учтите, что ранее установленные привилегии по умолчанию для групп пользователей будут сброшены." msgid "Default User Permissions Overview" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "Добавить группу репозиториев" @@ -5849,16 +6121,21 @@ msgstr "Группы репозиториев" msgid "Group Name" msgstr "Имя группы" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "" @@ -5874,7 +6151,7 @@ msgstr "Добавить подгруппу" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "Дополнительно" @@ -5903,91 +6180,73 @@ msgstr "Группа репозиториев: %s" msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" -msgstr "Подтвердите удаление группы %s" +msgstr "Подтвердите удаление группы: %s" #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:58 msgid "Delete this repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "владелец" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "Добавить новый" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." @@ -5998,19 +6257,23 @@ msgstr "" msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "Родительская группа" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " @@ -6025,7 +6288,7 @@ msgstr "Администрирование групп репозиториев" msgid "repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "" @@ -6042,51 +6305,51 @@ msgstr "" msgid "Clone from" msgstr "Клонировать из" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." -msgstr "Короткое и осмысленное. Для развернутого описания используйте файл README." - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "" +"Plain text format with support of {metatags}. Add a README file for longer " +"descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:79 -msgid "Set the type of repository to create." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" +msgid "{} Creating repository" msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 @@ -6118,7 +6381,7 @@ msgid "Remote" msgstr "Удалённый" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "Статистика" @@ -6227,7 +6490,7 @@ msgid "Delete forks" msgstr "Удалить fork'и" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Подтвердите удаление этого репозитория: %s" @@ -6252,6 +6515,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6290,7 +6562,7 @@ msgstr "Ключ" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 @@ -6478,8 +6750,8 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "Группа репозиториев" @@ -6497,9 +6769,9 @@ msgid "Remote uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "редактировать" @@ -6534,32 +6806,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "Изменить владельца репозитория" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "Приватный репозиторий" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "Включить статистику." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "Включить окно статистики на странице 'Общие сведения'." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "Включить скачивание" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "Включить меню скачивания на странице 'Общие сведения'." -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -6654,7 +6926,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "Сохранить настройки" @@ -6754,7 +7026,7 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6939,6 +7211,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6996,10 +7277,6 @@ msgid "" "custom size" msgstr "" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7068,97 +7345,97 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:66 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +"Parses meta tags from repository or repository group description fields and " +"turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "" "Number of items displayed in the main page dashboard before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:117 +#: rhodecode/templates/admin/settings/settings_visual.mako:106 msgid "Commit ID Style" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:121 +#: rhodecode/templates/admin/settings/settings_visual.mako:110 msgid "Commit sha length" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:128 +#: rhodecode/templates/admin/settings/settings_visual.mako:117 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "Иконки" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "Показывать иконки публичных репозиториев" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "Показывать иконки приватных репозиториев" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "" "Default renderer used to render comments, pull request descriptions and " "other description elements. After change old entries will still work " "correctly." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -7168,11 +7445,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7213,17 +7490,17 @@ msgid "%s user group settings" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "Участники" @@ -7240,54 +7517,59 @@ msgstr "" msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 -msgid "This group is set to be automatically synchronised." -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 +msgid "This group is set to be automatically synchronised." +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "" "Users will be added or removed from this group when they authenticate with " "RhodeCode system, based on LDAP group membership. This requires `LDAP+User " "group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, python-format msgid "" "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "" @@ -7321,7 +7603,7 @@ msgstr "Администрирование групп пользователей" msgid "user groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7361,7 +7643,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7392,16 +7674,12 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "User Groups Management" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" +msgid "User Groups Management" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 @@ -7415,113 +7693,91 @@ msgstr "Последний вход" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "" "When this is enabled user will have to change they password when they next " "use RhodeCode system. This will also forbid vcs operations until someone " "makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 msgid "Users personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "Подтвердите удаление пользователя %s" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "" "When selecting the detach option, the depending objects owned by this user " @@ -7533,10 +7789,6 @@ msgstr "" msgid "User Audit Logs" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 -msgid "audit filter..." -msgstr "" - #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" @@ -7555,10 +7807,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7615,6 +7863,29 @@ msgstr "" msgid "Help translate %(rc_link)s into your language." msgstr "" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "" +"Below is a 2048 bit generated SSH RSA key. You can use it to access " +"RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" msgstr "Администрирование пользователей" @@ -7656,141 +7927,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: rhodecode/templates/base/base.mako:228 -#: rhodecode/templates/data_table/_dt_elements.mako:12 -#: rhodecode/templates/data_table/_dt_elements.mako:13 -#: rhodecode/templates/data_table/_dt_elements.mako:153 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "Общие сведения" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "История изменений" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "Файлы" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "Сравнить" -#: rhodecode/templates/base/base.mako:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "Показать pull-request'ы для %s" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "Опции" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "Сравнить форк" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "Сравнить fork с %s" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Поиск" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "Разблокировать" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "Заблокировать" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "Форк" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "Журнал" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "Журнал" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 +#: rhodecode/templates/base/base.mako:400 msgid "Public journal" msgstr "Общедоступный журнал" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:405 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:401 +#: rhodecode/templates/base/base.mako:406 msgid "Gists" msgstr "Gist" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7812,15 +8083,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "" @@ -7930,9 +8201,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "Предпросмотр" @@ -7940,77 +8211,94 @@ msgstr "Предпросмотр" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "показать" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "ничего" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "читать" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "записывать" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "администратор" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "Привилегия" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "Изменить привилегии" -#: rhodecode/templates/base/perms_summary.mako:85 -msgid "Super admin" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:87 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 msgid "Repository default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:88 +#: rhodecode/templates/base/perms_summary.mako:120 msgid "Repository group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:89 +#: rhodecode/templates/base/perms_summary.mako:123 msgid "User group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:126 +msgid "Super admin" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "Создать репозитории" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "Создавать fork от репозиториев" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "Создавать группы пользователей" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8133,93 +8421,74 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "" -"These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "" -"Use rebase instead of creating a merge commit when merging via web " -"interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "" "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -8227,16 +8496,40 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." msgstr "" +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "" +"Use rebase instead of creating a merge commit when merging via web " +"interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "" +"Close branch before merging it into destination branch. No effect when " +"rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -8251,8 +8544,8 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -8273,8 +8566,8 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -8286,57 +8579,54 @@ msgstr "Ветка %s" msgid "%s Changelog" msgstr "Логи изменений %s" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "Сравнить fork с %s" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "Очистить выбор" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "Возраст" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "Ссылки" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "Изменений ещё нет" @@ -8354,8 +8644,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8368,43 +8657,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "свести" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8412,7 +8706,7 @@ msgstr "свести" msgid "Tag %s" msgstr "Метка %s" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8425,106 +8719,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "Родитель" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 +#: rhodecode/templates/changeset/changeset.mako:142 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "Отобразить в формате diff" -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:143 msgid "Raw Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:143 +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "Применить разностное исправление (Patch diff)" -#: rhodecode/templates/changeset/changeset.mako:144 +#: rhodecode/templates/changeset/changeset.mako:147 msgid "Patch Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:147 +#: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "Скачать diff" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8594,12 +8866,12 @@ msgid "Leave a comment on this Commit." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Авторизоваться сейчас" @@ -8619,7 +8891,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Закрыто" @@ -8637,17 +8909,8 @@ msgstr "Комментировать" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8659,35 +8922,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8695,8 +8936,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -8704,8 +8945,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" msgstr "Показать полный diff" @@ -8718,74 +8959,50 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "" -"%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:118 +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "Нет файлов" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "" +"This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "" -"This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:415 #: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format @@ -8844,7 +9061,7 @@ msgstr "" msgid "Wide Mode Diff" msgstr "" -#: rhodecode/templates/codeblocks/source.mako:24 +#: rhodecode/templates/codeblocks/source.mako:25 msgid "view annotation from before this change" msgstr "" @@ -8857,29 +9074,11 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" msgstr "" @@ -8889,15 +9088,6 @@ msgstr "" msgid "%s Compare" msgstr "%s Сравнить" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 @@ -8911,14 +9101,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "Исходный код" @@ -8942,74 +9132,69 @@ msgstr "" msgid "Compare commits, branches, bookmarks or tags." msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:49 +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "Репозиторий Mercurial" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "Git репозиторий" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "Публичный репозиторий" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "Подписаться на ленту RSS %s" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "Подписаться на ленту Atom %s" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "Создано" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, 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] "Подтвердите удаление группы %s содержащей %s репозиториев." -msgstr[1] "Подтвердите удаление группы %s содержащей %s репозиториев." -msgstr[2] "Подтвердите удаление группы %s содержащей %s репозиториев." -msgstr[3] "Подтвердите удаление группы %s содержащей %s репозиториев." - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Подтвердите удаление следующей группы пользователей: %s" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "Группа пользователей" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "Приватный" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" @@ -9311,15 +9496,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -9335,15 +9511,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9379,15 +9546,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9455,22 +9613,22 @@ msgid "Create New File" msgstr "" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "Применить изменения" @@ -9525,15 +9683,15 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "Бинарный файл (%s)" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" -msgstr "Файл слишком большой для отображения" +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " +msgstr "" #: rhodecode/templates/files/files_delete.mako:70 msgid "Delete File" @@ -9582,15 +9740,15 @@ msgstr "исходник" msgid "annotation" msgstr "аннотация" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" msgstr "" -#: rhodecode/templates/files/files_edit.mako:74 +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "Редактирование файла" @@ -9598,64 +9756,55 @@ msgstr "Редактирование файла" msgid "Location" msgstr "Расположение" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "История" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 -msgid "Annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 -msgid "Raw" -msgstr "" - #: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 +msgid "Annotation" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 +msgid "Raw" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "Скачать" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9669,22 +9818,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "Имя форка" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "Скопировать привилегии" -#: rhodecode/templates/forks/fork.mako:97 +#: rhodecode/templates/forks/fork.mako:102 msgid "Copy permissions from forked repository" msgstr "Скопировать привилегии с форкнутого репозитория" -#: rhodecode/templates/forks/fork.mako:102 +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "" @@ -9697,36 +9847,23 @@ msgstr "Форки %s" msgid "Forks" msgstr "Ответвления" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "Форкнуто" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "Форки ещё не созданы" - -#: rhodecode/templates/journal/journal.mako:13 +#: rhodecode/templates/journal/journal.mako:14 msgid "Filter" msgstr "" -#: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "%s запись" -msgstr[1] "%s записей" -msgstr[2] "%s записи" -msgstr[3] "%s записи" - -#: rhodecode/templates/journal/journal.mako:23 +#: rhodecode/templates/journal/journal.mako:24 msgid "ATOM journal feed" msgstr "Лента журнала ATOM" -#: rhodecode/templates/journal/journal.mako:24 +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "Лента журнала RSS" @@ -9735,15 +9872,15 @@ msgid "No entries yet" msgstr "Записи отсуствуют" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "Публичный журнал" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "Общая лента журнала ATOM" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "Общая лента журнала RSS" @@ -9773,22 +9910,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "Рецензенты запросов на внесение изменений Pull request" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9801,15 +9938,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9834,26 +9962,26 @@ msgstr "" msgid "Merge is not currently possible because of below failed checks." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9874,175 +10002,175 @@ msgstr "Подтвердите удаление этого pull-request'а" msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 -#, python-format -msgid "calculated based on %s reviewer vote" -msgid_plural "calculated based on %s reviewers votes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 -msgid "{} version available for this pull request, show it." -msgid_plural "{} versions available for this pull request, show them." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 -#, python-format -msgid "%d General " -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 +msgid "Mandatory reviewer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "" "These commits cannot be displayed, because this repository uses the " "Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 msgid "" "This pull request cannot be displayed, because one or more commits no longer" " exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 msgid "" "Please update this pull request, push the commits back into the source " "repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 msgid "" "Commits and changes between v{ver_from} and {ver_to} of this pull request, " "commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -10145,7 +10273,7 @@ msgstr "" msgid "Age (old first)" msgstr "" -#: rhodecode/templates/search/search_content.mako:33 +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "" @@ -10153,84 +10281,74 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "%s общие сведения" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "ATOM лента репозитория %s" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "RSS лента репозитория %s" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 -msgid "Show by Name" -msgstr "Показать по имени" - -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 -msgid "Show by ID" -msgstr "Показать по ID" - -#: rhodecode/templates/summary/components.mako:56 -msgid "SVN Protocol is disabled. To enable it, see the" -msgstr "" - #: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 +msgid "Show by Name" +msgstr "Показать по имени" + +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 +msgid "Show by ID" +msgstr "Показать по ID" + +#: rhodecode/templates/summary/components.mako:61 +msgid "SVN Protocol is disabled. To enable it, see the" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "Ссылка для клонирования" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "Статистические данные отключены для этого репозитария" -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "Скачиваний ещё нет" -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "Скачивание отключено в этом репозитории" -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" msgstr "" @@ -10248,6 +10366,21 @@ msgstr "Быстрый старт" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "%s общие сведения" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "ATOM лента репозитория %s" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "RSS лента репозитория %s" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" msgstr "" diff --git a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-06-27 17:25+0200\n" -"PO-Revision-Date: 2017-06-27 15:26+0000\n" +"POT-Creation-Date: 2017-11-03 16:42+0100\n" +"PO-Revision-Date: 2017-11-03 15:43+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Chinese (http://www.transifex.com/rhodecode/RhodeCode/language/zh/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:166 +#: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" @@ -91,17 +91,86 @@ msgid "System Info" msgstr "系统信息" #: rhodecode/apps/admin/navigation.py:97 -msgid "User Sessions" +msgid "Processes" msgstr "" #: rhodecode/apps/admin/navigation.py:99 +msgid "User Sessions" +msgstr "" + +#: rhodecode/apps/admin/navigation.py:101 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:107 +#: rhodecode/apps/admin/navigation.py:109 msgid "Labs" msgstr "" +#: rhodecode/apps/admin/views/defaults.py:90 +msgid "Default settings updated successfully" +msgstr "默认设置已经成功更新" + +#: rhodecode/apps/admin/views/defaults.py:108 +msgid "Error occurred during update of default values" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:121 +msgid "Application permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:213 +#: rhodecode/apps/admin/views/permissions.py:287 +msgid "Error occurred during update of permissions" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:193 +msgid "Object permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:267 +msgid "Global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/templates/admin/gists/show.mako:63 +#: rhodecode/templates/admin/integrations/list.mako:208 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:166 +#: rhodecode/templates/data_table/_dt_elements.mako:240 +#: rhodecode/templates/data_table/_dt_elements.mako:253 +#: rhodecode/templates/data_table/_dt_elements.mako:254 +#: rhodecode/templates/data_table/_dt_elements.mako:266 +#: rhodecode/templates/debug_style/buttons.html:128 +#: rhodecode/templates/files/files_add.mako:208 +#: rhodecode/templates/files/files_edit.mako:168 +#: rhodecode/templates/files/files_source.mako:54 +#: rhodecode/templates/files/files_source.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/users/user_profile.mako:7 +msgid "Edit" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:476 +msgid "Updated SSH keys file: {}" +msgstr "" + +#: rhodecode/apps/admin/views/permissions.py:479 +msgid "SSH key support is disabled in .ini file" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:180 +#, python-format +msgid "Created repository group %s" +msgstr "" + +#: rhodecode/apps/admin/views/repo_groups.py:198 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "" + #: rhodecode/apps/admin/views/sessions.py:92 msgid "Cleaned up old sessions" msgstr "" @@ -264,272 +333,858 @@ msgstr "HG" msgid "SVN" msgstr "SVN" -#: rhodecode/apps/admin/views/users.py:63 -#: rhodecode/controllers/admin/users.py:360 -#: rhodecode/controllers/admin/users.py:381 -#: rhodecode/controllers/admin/users.py:412 -#: rhodecode/controllers/admin/users.py:486 -msgid "You can't edit this user" -msgstr "无法编辑该用户" - -#: rhodecode/apps/admin/views/users.py:168 -#: rhodecode/apps/my_account/views.py:148 -#: rhodecode/controllers/admin/gists.py:62 -msgid "forever" -msgstr "永久" - -#: rhodecode/apps/admin/views/users.py:169 -#: rhodecode/apps/my_account/views.py:149 -#: rhodecode/controllers/admin/gists.py:63 -msgid "5 minutes" -msgstr "5分钟" - -#: rhodecode/apps/admin/views/users.py:170 -#: rhodecode/apps/my_account/views.py:150 -#: rhodecode/controllers/admin/gists.py:64 -msgid "1 hour" -msgstr "1小时" - -#: rhodecode/apps/admin/views/users.py:171 -#: rhodecode/apps/my_account/views.py:151 -#: rhodecode/controllers/admin/gists.py:65 -msgid "1 day" -msgstr "1天" - -#: rhodecode/apps/admin/views/users.py:172 -#: rhodecode/apps/my_account/views.py:152 -#: rhodecode/controllers/admin/gists.py:66 -msgid "1 month" -msgstr "1个月" - -#: rhodecode/apps/admin/views/users.py:174 -#: rhodecode/apps/my_account/views.py:154 -#: rhodecode/controllers/admin/gists.py:70 -msgid "Lifetime" -msgstr "终身" - -#: rhodecode/apps/admin/views/users.py:178 -#: rhodecode/apps/my_account/views.py:158 +#: rhodecode/apps/admin/views/user_groups.py:220 +#, python-format +msgid "Created user group %(user_group_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/user_groups.py:242 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:208 +#, python-format +msgid "Created user %(user_link)s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:229 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:303 +msgid "User updated successfully" +msgstr "用户更新成功" + +#: rhodecode/apps/admin/views/users.py:321 +#: rhodecode/apps/my_account/views/my_account.py:485 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:353 +#, python-format +msgid "Detached %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:358 +#, python-format +msgid "Deleted %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:366 +#, python-format +msgid "Detached %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:371 +#, python-format +msgid "Deleted %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:379 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format +msgid "Deleted %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:401 +msgid "Successfully deleted user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:407 +msgid "An error occurred during deletion of user" +msgstr "删除用户时发生错误" + +#: rhodecode/apps/admin/views/users.py:472 +msgid "" +"The user participates as reviewer in {} pull request and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:478 +msgid "" +"The user participates as reviewer in {} pull requests and cannot be deleted. \n" +"You can set the user to \"{}\" instead of deleting it." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:565 +msgid "User global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:583 +#: rhodecode/apps/user_group/views/__init__.py:472 +msgid "An error occurred during permissions saving" +msgstr "保存权限时发生错误" + +#: rhodecode/apps/admin/views/users.py:608 +msgid "Force password change disabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:613 +msgid "Force password change enabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:622 +msgid "An error occurred during password reset for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:661 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:667 +#, python-format +msgid "Created repository group `%s`" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:671 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:676 +msgid "An error occurred during repository group creation for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/my_account/views/my_account.py:159 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "" -#: rhodecode/apps/admin/views/users.py:217 -#: rhodecode/apps/my_account/views.py:191 +#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/my_account/views/my_account.py:193 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:246 -#: rhodecode/apps/my_account/views.py:215 +#: rhodecode/apps/admin/views/users.py:766 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:290 -#: rhodecode/apps/my_account/views.py:253 +#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 +msgid "Ssh Key successfully created" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:842 +#: rhodecode/apps/admin/views/users.py:847 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:122 +msgid "An error occurred during ssh key saving: {}" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:881 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:152 +msgid "Ssh key successfully deleted" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:922 +#: rhodecode/apps/my_account/views/my_account.py:255 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:296 -#: rhodecode/apps/my_account/views.py:259 +#: rhodecode/apps/admin/views/users.py:928 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:932 +#: rhodecode/apps/my_account/views/my_account.py:261 msgid "An error occurred during email saving" msgstr "保存电子邮件时发生错误" -#: rhodecode/apps/admin/views/users.py:323 +#: rhodecode/apps/admin/views/users.py:959 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:1005 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:389 +#: rhodecode/apps/admin/views/users.py:1023 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:393 +#: rhodecode/apps/admin/views/users.py:1027 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:423 +#: rhodecode/apps/admin/views/users.py:1057 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:1122 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230 -#: rhodecode/controllers/pullrequests.py:191 -#: rhodecode/templates/admin/my_account/my_account.mako:38 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 +msgid "forever" +msgstr "永久" + +#: rhodecode/apps/gist/views.py:58 +msgid "5 minutes" +msgstr "5分钟" + +#: rhodecode/apps/gist/views.py:59 +msgid "1 hour" +msgstr "1小时" + +#: rhodecode/apps/gist/views.py:60 +msgid "1 day" +msgstr "1天" + +#: rhodecode/apps/gist/views.py:61 +msgid "1 month" +msgstr "1个月" + +#: rhodecode/apps/gist/views.py:64 +#: rhodecode/public/js/rhodecode-components.js:47769 +#: rhodecode/public/js/scripts.js:39617 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode.js:507 +msgid "Lifetime" +msgstr "终身" + +#: rhodecode/apps/gist/views.py:66 +msgid "Requires registered account" +msgstr "" + +#: rhodecode/apps/gist/views.py:67 +msgid "Can be accessed by anonymous users" +msgstr "" + +#: rhodecode/apps/gist/views.py:214 +msgid "Error occurred during gist creation" +msgstr "" + +#: rhodecode/apps/gist/views.py:238 +#, python-format +msgid "Deleted gist %s" +msgstr "" + +#: rhodecode/apps/gist/views.py:324 +#: rhodecode/templates/admin/gists/show.mako:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 +#: rhodecode/templates/data_table/_dt_elements.mako:323 +msgid "never" +msgstr "" + +#: rhodecode/apps/gist/views.py:330 +#, python-format +msgid "%(expiry)s - current value" +msgstr "" + +#: rhodecode/apps/gist/views.py:375 +msgid "Successfully updated gist content" +msgstr "" + +#: rhodecode/apps/gist/views.py:380 +msgid "Successfully updated gist data" +msgstr "" + +#: rhodecode/apps/gist/views.py:383 +msgid "Error occurred during update of gist {}: {}" +msgstr "" + +#: rhodecode/apps/gist/views.py:387 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "" + +#: rhodecode/apps/home/views.py:215 rhodecode/apps/home/views.py:248 +#: rhodecode/apps/repository/views/repo_pull_requests.py:731 +#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:76 #: rhodecode/templates/base/base.mako:148 -#: rhodecode/templates/base/base.mako:575 +#: rhodecode/templates/base/base.mako:580 msgid "Repositories" msgstr "版本库" -#: rhodecode/apps/home/views.py:223 +#: rhodecode/apps/home/views.py:241 msgid "Groups" msgstr "组" -#: rhodecode/apps/home/views.py:243 +#: rhodecode/apps/home/views.py:261 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +msgid "public journal" +msgstr "公共日志" + +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +msgid "journal" +msgstr "日志" + +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:279 +#: rhodecode/apps/login/views.py:281 msgid "You have successfully registered with RhodeCode" msgstr "" -#: rhodecode/apps/login/views.py:315 +#: rhodecode/apps/login/views.py:317 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:321 +#: rhodecode/apps/login/views.py:323 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:410 +#: rhodecode/apps/login/views.py:412 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:418 +#: rhodecode/apps/login/views.py:420 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "" -#: rhodecode/apps/my_account/views.py:125 +#: rhodecode/apps/my_account/views/my_account.py:134 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views.py:132 +#: rhodecode/apps/my_account/views/my_account.py:141 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views.py:281 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:70 +#: rhodecode/apps/my_account/views/my_account.py:465 +msgid "Your account was updated successfully" +msgstr "你的帐号已经更新完成" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98 +#, python-format +msgid "Removed repository group `%s`" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 +#: rhodecode/apps/user_group/views/__init__.py:353 +msgid "Cannot change permission for yourself as admin" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +msgid "Repository Group permissions updated" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +msgid "Repository Group `{}` updated successfully" +msgstr "" + +#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_caches.py:67 msgid "Cache invalidation successful" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:74 +#: rhodecode/apps/repository/views/repo_caches.py:71 msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: rhodecode/apps/repository/views/repo_permissions.py:95 +#: rhodecode/apps/repository/views/repo_changelog.py:66 +#: rhodecode/apps/repository/views/repo_compare.py:66 +#: rhodecode/apps/repository/views/repo_pull_requests.py:607 +msgid "There are no commits yet" +msgstr "" + +#: rhodecode/apps/repository/views/repo_changelog.py:71 +#: rhodecode/apps/repository/views/repo_commits.py:193 +#: rhodecode/apps/repository/views/repo_files.py:150 +#: rhodecode/apps/repository/views/repo_files.py:170 +msgid "No such commit exists for this repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:95 +#, python-format +msgid "Created repository %s from %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:104 +#, python-format +msgid "Forked repository %s as %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_checks.py:107 +#, python-format +msgid "Created repository %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:73 +msgid "Show whitespace" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:74 +msgid "Show whitespace for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:80 +msgid "Ignore whitespace" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:81 +msgid "Ignore whitespace for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:139 +msgid "Increase context" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:140 +msgid "Increase context for all diffs" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:389 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#, python-format +msgid "Status change %(transition_icon)s %(status)s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_commits.py:433 +msgid "" +"Changing the status of a commit associated with a closed pull request is not" +" allowed" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:104 +msgid "Select commit" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:171 +msgid "Could not find the source repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:179 +msgid "Could not find the target repo: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:190 +msgid "The comparison of two different kinds of remote repos is not available" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:229 +msgid "Could not compare repos with different large file settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_compare.py:275 +#, python-format +msgid "" +"Repositories unrelated. Cannot compare commit %(commit1)s from repository " +"%(repo1)s with commit %(commit2)s from repository %(repo2)s." +msgstr "" + +#: rhodecode/apps/repository/views/repo_feed.py:70 +#, python-format +msgid "Changes on %s repository" +msgstr "%s 库的修改" + +#: rhodecode/apps/repository/views/repo_feed.py:71 +#, python-format +msgid "%s %s feed" +msgstr "%s %s 订阅" + +#: rhodecode/apps/repository/views/repo_files.py:94 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:140 +msgid "Click here to add a new file." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:145 +#, python-format +msgid "There are no files yet. %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:259 +msgid "Downloads disabled" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:265 +msgid "Unknown archive type for: `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:271 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:274 +msgid "Empty repository" +msgstr "空版本库" + +#: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown archive type" +msgstr "未知包类型" + +#: rhodecode/apps/repository/views/repo_files.py:865 +msgid "Changesets" +msgstr "修订集" + +#: rhodecode/apps/repository/views/repo_files.py:886 +#: rhodecode/apps/repository/views/repo_summary.py:321 +#: rhodecode/model/pull_request.py:1366 rhodecode/model/scm.py:776 +#: rhodecode/templates/base/vcs_settings.mako:235 +msgid "Branches" +msgstr "分支" + +#: rhodecode/apps/repository/views/repo_files.py:890 +#: rhodecode/model/scm.py:791 rhodecode/templates/base/vcs_settings.mako:260 +msgid "Tags" +msgstr "标签" + +#: rhodecode/apps/repository/views/repo_files.py:987 +#: rhodecode/apps/repository/views/repo_files.py:1018 +msgid "You can only delete files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:997 +#: rhodecode/apps/repository/views/repo_files.py:1028 +msgid "Deleted file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1049 +msgid "Successfully deleted file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1053 +#: rhodecode/apps/repository/views/repo_files.py:1171 +#: rhodecode/apps/repository/views/repo_files.py:1290 +msgid "Error occurred during commit" +msgstr "提交时发生错误" + +#: rhodecode/apps/repository/views/repo_files.py:1071 +#: rhodecode/apps/repository/views/repo_files.py:1108 +msgid "You can only edit files with commit being a valid branch " +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1088 +#: rhodecode/apps/repository/views/repo_files.py:1125 +msgid "Edited file {} via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1143 +msgid "No changes" +msgstr "无变更" + +#: rhodecode/apps/repository/views/repo_files.py:1167 +msgid "Successfully committed changes to file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1191 +#: rhodecode/apps/repository/views/repo_files.py:1215 +msgid "Added file via RhodeCode Enterprise" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1248 +msgid "No filename" +msgstr "无文件名" + +#: rhodecode/apps/repository/views/repo_files.py:1278 +msgid "Successfully committed new file `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1282 +msgid "" +"The location specified must be a relative path and must not contain .. in " +"the path" +msgstr "" + +#: rhodecode/apps/repository/views/repo_forks.py:144 +#: rhodecode/templates/base/base.mako:262 +msgid "Compare fork" +msgstr "比较复刻" + +#: rhodecode/apps/repository/views/repo_forks.py:250 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "在复刻版本库 %s 的时候发生错误" + +#: rhodecode/apps/repository/views/repo_permissions.py:86 msgid "Repository permissions updated" msgstr "" +#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +msgid "Commit does not exist" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:757 +msgid "Pull request requires a title with min. 3 chars" +msgstr "拉取请求的标题至少3个字符" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:759 +msgid "Error creating pull request: {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +msgid "Not Enough permissions to source repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +msgid "Not Enough permissions to target repo `{}`." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +msgid "Successfully opened new pull request" +msgstr "成功提交拉取请求" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +msgid "Error occurred during creation of this pull request." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +msgid "Cannot update closed pull requests." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +msgid "Pull request title & description updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +msgid "" +"Pull request updated to \"{source_commit_id}\" with {count_added} added, " +"{count_removed} removed commits. Source of changes: {change_source}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +msgid "Reload page" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +msgid "Pull request was successfully merged and closed." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +msgid "Successfully deleted pull request" +msgstr "成功删除拉取请求" + +#: rhodecode/apps/repository/views/repo_settings.py:167 +msgid "Repository `{}` updated successfully" +msgstr "" + #: rhodecode/apps/repository/views/repo_settings.py:171 -msgid "Repository {} updated successfully" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:93 +#: rhodecode/apps/repository/views/repo_settings.py:193 +msgid "Unlocked" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:198 +msgid "Locked" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:200 +#, python-format +msgid "Repository has been %s" +msgstr "版本库曾经为 %s" + +#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:230 +msgid "An error occurred during unlocking" +msgstr "解锁时发生错误" + +#: rhodecode/apps/repository/views/repo_settings.py:248 +msgid "An error occurred during deletion of repository stats" +msgstr "删除版本库统计时发生错误" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:91 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:96 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:94 #, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:109 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:107 #, python-format msgid "Deleted repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:116 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 msgid "detach or delete" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:117 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:115 msgid "" "Cannot delete `{repo}` it still contains attached forks. Try using " "{delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:127 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:125 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:152 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:150 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:156 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:154 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:184 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:190 msgid "Nothing" msgstr "无" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:186 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 #, python-format msgid "Marked repo %s as fork of %s" msgstr "成功将版本库 %s 标记为复刻自 %s" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:193 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:224 msgid "Locked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:220 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:227 msgid "Unlocked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:223 -#: rhodecode/controllers/admin/repos.py:363 -msgid "An error occurred during unlocking" -msgstr "解锁时发生错误" - -#: rhodecode/apps/repository/views/repo_summary.py:293 +#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +msgid "An error occurred during creation of field" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +msgid "An error occurred during removal of field" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +msgid "Error occurred during deleting issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:88 +#: rhodecode/controllers/admin/settings.py:384 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:123 +#: rhodecode/controllers/admin/settings.py:431 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:66 +msgid "Pulled from remote location" +msgstr "成功拉取自远程路径" + +#: rhodecode/apps/repository/views/repo_settings_remote.py:69 +msgid "An error occurred during pull from remote location" +msgstr "从远程路径拉取时发生错误" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:622 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +#: rhodecode/controllers/admin/settings.py:176 +msgid "Updated VCS settings" +msgstr "成功更新版本控制系统设置" + +#: rhodecode/apps/repository/views/repo_settings_vcs.py:147 +msgid "Error occurred during updating repository VCS settings" +msgstr "" + +#: rhodecode/apps/repository/views/repo_summary.py:296 msgid "Branch" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:294 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Tag" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:295 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Bookmark" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:318 -#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345 -#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255 -msgid "Branches" -msgstr "分支" - -#: rhodecode/apps/repository/views/repo_summary.py:319 +#: rhodecode/apps/repository/views/repo_summary.py:322 msgid "Closed branches" msgstr "" +#: rhodecode/apps/ssh_support/events.py:29 +msgid "RhodeCode SSH Key files changed." +msgstr "" + #: rhodecode/apps/svn_support/events.py:30 -msgid "Configuration for Apaache mad_dav_svn changed." +msgid "Configuration for Apache mad_dav_svn changed." +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:209 +#, python-format +msgid "Updated user group %s" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:231 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:257 +msgid "Successfully deleted user group" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:262 +msgid "An error occurred during deletion of user group" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:366 +msgid "Target group cannot be the same" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:381 +msgid "User Group permissions updated" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:452 +msgid "User Group global permissions updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:534 +msgid "User Group synchronization updated successfully" +msgstr "" + +#: rhodecode/apps/user_group/views/__init__.py:538 +msgid "An error occurred during synchronization update" msgstr "" #: rhodecode/authentication/schema.py:35 @@ -537,21 +1192,21 @@ msgid "Enable or disable this authentica msgstr "" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 -#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 -#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 +#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 +#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 +#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.mako:101 +#: rhodecode/templates/admin/integrations/list.mako:105 msgid "Enabled" msgstr "启用" #: rhodecode/authentication/schema.py:43 msgid "" -"Amount of seconds to cache the authentication responsecall for this plugin. \n" -"Useful for long calls like LDAP to improve the performance of the authentication system (0 means disabled)." -msgstr "" - -#: rhodecode/authentication/schema.py:49 +"Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" +"Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." +msgstr "" + +#: rhodecode/authentication/schema.py:48 msgid "Auth Cache TTL" msgstr "" @@ -560,15 +1215,15 @@ msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172 +#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:177 +#: rhodecode/authentication/views.py:181 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:187 +#: rhodecode/authentication/views.py:191 msgid "Error occurred during update of auth settings." msgstr "" @@ -655,7 +1310,6 @@ msgid "The url of the Jasig CAS REST ser msgstr "" #: rhodecode/authentication/plugins/auth_jasig_cas.py:64 -#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" @@ -694,10 +1348,11 @@ msgid "Password to authenticate for give msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 +#: rhodecode/integrations/types/webhook.py:214 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:324 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "密码" @@ -788,7 +1443,7 @@ msgstr "" msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:365 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "LDAP" msgstr "" @@ -821,474 +1476,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:85 -msgid "There are no commits yet" -msgstr "" - -#: rhodecode/controllers/changeset.py:76 -msgid "Show whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:77 -msgid "Show whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:83 -msgid "Ignore whitespace" -msgstr "" - -#: rhodecode/controllers/changeset.py:84 -msgid "Ignore whitespace for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:140 -msgid "Increase context" -msgstr "" - -#: rhodecode/controllers/changeset.py:141 -msgid "Increase context for all diffs" -msgstr "" - -#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106 -#: rhodecode/controllers/files.py:128 -msgid "No such commit exists for this repository" -msgstr "" - -#: rhodecode/controllers/changeset.py:343 -#: rhodecode/controllers/pullrequests.py:919 -#, python-format -msgid "Status change %(transition_icon)s %(status)s" -msgstr "" - -#: rhodecode/controllers/changeset.py:387 -msgid "" -"Changing the status of a commit associated with a closed pull request is not" -" allowed" -msgstr "" - -#: rhodecode/controllers/compare.py:92 -msgid "Select commit" -msgstr "" - -#: rhodecode/controllers/compare.py:149 -msgid "Could not find the source repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:156 -msgid "Could not find the target repo: `{}`" -msgstr "" - -#: rhodecode/controllers/compare.py:166 -msgid "The comparison of two different kinds of remote repos is not available" -msgstr "" - -#: rhodecode/controllers/compare.py:204 -msgid "Could not compare repos with different large file settings" -msgstr "" - -#: rhodecode/controllers/compare.py:244 -#, python-format -msgid "" -"Repositories unrelated. Cannot compare commit %(commit1)s from repository " -"%(repo1)s with commit %(commit2)s from repository %(repo2)s." -msgstr "" - -#: rhodecode/controllers/feed.py:69 -#, python-format -msgid "Changes on %s repository" -msgstr "%s 库的修改" - -#: rhodecode/controllers/feed.py:70 -#, python-format -msgid "%s %s feed" -msgstr "%s %s 订阅" - -#: rhodecode/controllers/files.py:98 -msgid "Click here to add a new file." -msgstr "" - -#: rhodecode/controllers/files.py:103 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487 -#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593 -#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495 -msgid "You can only delete files with revision being a valid branch " -msgstr "" - -#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504 -msgid "Deleted file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:472 -msgid "Successfully deleted file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582 -#: rhodecode/controllers/files.py:719 -msgid "Error occurred during commit" -msgstr "提交时发生错误" - -#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601 -msgid "You can only edit files with revision being a valid branch " -msgstr "" - -#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613 -msgid "Edited file {} via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:555 -msgid "No changes" -msgstr "无变更" - -#: rhodecode/controllers/files.py:578 -msgid "Successfully committed changes to file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740 -msgid "Added file via RhodeCode Enterprise" -msgstr "" - -#: rhodecode/controllers/files.py:677 -msgid "No filename" -msgstr "无文件名" - -#: rhodecode/controllers/files.py:707 -msgid "Successfully committed new file `{}`" -msgstr "" - -#: rhodecode/controllers/files.py:710 -msgid "" -"The location specified must be a relative path and must not contain .. in " -"the path" -msgstr "" - -#: rhodecode/controllers/files.py:763 -msgid "Downloads disabled" -msgstr "" - -#: rhodecode/controllers/files.py:769 -#, python-format -msgid "Unknown revision %s" -msgstr "未知版本 %s" - -#: rhodecode/controllers/files.py:771 -msgid "Empty repository" -msgstr "空版本库" - -#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807 -msgid "Unknown archive type" -msgstr "未知包类型" - -#: rhodecode/controllers/files.py:1000 -msgid "Changesets" -msgstr "修订集" - -#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790 -#: rhodecode/templates/base/vcs_settings.mako:280 -msgid "Tags" -msgstr "标签" - -#: rhodecode/controllers/forks.py:190 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "在复刻版本库 %s 的时候发生错误" - -#: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150 -msgid "public journal" -msgstr "公共日志" - -#: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154 -msgid "journal" -msgstr "日志" - -#: rhodecode/controllers/pullrequests.py:99 -msgid "Commit does not exist" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:216 -msgid "Pull request requires a title with min. 3 chars" -msgstr "拉取请求的标题至少3个字符" - -#: rhodecode/controllers/pullrequests.py:218 -msgid "Error creating pull request: {}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:276 -msgid "Successfully opened new pull request" -msgstr "成功提交拉取请求" - -#: rhodecode/controllers/pullrequests.py:279 -msgid "Error occurred during creation of this pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:322 -msgid "Cannot update closed pull requests." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:328 -msgid "Pull request title & description updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:346 -msgid "" -"Pull request updated to \"{source_commit_id}\" with {count_added} added, " -"{count_removed} removed commits. Source of changes: {change_source}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:363 -msgid "Reload page" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:437 -msgid "Pull request was successfully merged and closed." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:461 -msgid "Pull request reviewers updated." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:482 -msgid "Successfully deleted pull request" -msgstr "成功删除拉取请求" - -#: rhodecode/controllers/pullrequests.py:486 -msgid "Your are not allowed to delete this pull request" -msgstr "" - -#: rhodecode/controllers/admin/defaults.py:84 -msgid "Default settings updated successfully" -msgstr "默认设置已经成功更新" - -#: rhodecode/controllers/admin/defaults.py:99 -msgid "Error occurred during update of default values" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:72 -msgid "Requires registered account" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:73 -msgid "Can be accessed by anonymous users" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:199 -msgid "Error occurred during gist creation" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:230 -#, python-format -msgid "Deleted gist %s" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:306 -msgid "Successfully updated gist content" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:311 -msgid "Successfully updated gist data" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:314 -msgid "Error occurred during update of gist {}: {}" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:318 -#, python-format -msgid "Error occurred during update of gist %s" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:343 -#: rhodecode/templates/admin/gists/show.mako:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -msgid "never" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:350 -#, python-format -msgid "%(expiry)s - current value" -msgstr "" - -#: rhodecode/controllers/admin/my_account.py:70 -msgid "You can't edit this user since it's crucial for entire application" -msgstr "由于是系统帐号，无法编辑该用户" - -#: rhodecode/controllers/admin/my_account.py:110 -msgid "Your account was updated successfully" -msgstr "你的帐号已经更新完成" - -#: rhodecode/controllers/admin/my_account.py:125 -#: rhodecode/controllers/admin/users.py:182 -#, python-format -msgid "Error occurred during update of user %s" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:107 -msgid "Application permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:122 -#: rhodecode/controllers/admin/permissions.py:171 -#: rhodecode/controllers/admin/permissions.py:225 -msgid "Error occurred during update of permissions" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:156 -msgid "Object permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:210 -msgid "Global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:202 -#, python-format -msgid "Created repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:215 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:261 -#, python-format -msgid "Updated repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:276 -#, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:291 -#, python-format -msgid "This group contains %(num)d repository and cannot be deleted" -msgid_plural "This group contains %(num)d repositories and cannot be deleted" -msgstr[0] "" - -#: rhodecode/controllers/admin/repo_groups.py:300 -#, python-format -msgid "This group contains %(num)d subgroup and cannot be deleted" -msgid_plural "This group contains %(num)d subgroups and cannot be deleted" -msgstr[0] "" - -#: rhodecode/controllers/admin/repo_groups.py:313 -#, python-format -msgid "Removed repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:317 -#, python-format -msgid "Error occurred during deletion of repository group %s" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:381 -#: rhodecode/controllers/admin/user_groups.py:318 -msgid "Cannot change permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repo_groups.py:404 -msgid "Repository Group permissions updated" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:125 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:129 -#, python-format -msgid "Error creating repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:270 -#, python-format -msgid "Created repository %s from %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:279 -#, python-format -msgid "Forked repository %s as %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:282 -#, python-format -msgid "Created repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:319 -msgid "An error occurred during creation of field" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:334 -msgid "An error occurred during removal of field" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:353 -msgid "Unlocked" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:357 -msgid "Locked" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:359 -#, python-format -msgid "Repository has been %s" -msgstr "版本库曾经为 %s" - -#: rhodecode/controllers/admin/repos.py:373 -msgid "Pulled from remote location" -msgstr "成功拉取自远程路径" - -#: rhodecode/controllers/admin/repos.py:376 -msgid "An error occurred during pull from remote location" -msgstr "从远程路径拉取时发生错误" - -#: rhodecode/controllers/admin/repos.py:397 -msgid "An error occurred during deletion of repository stats" -msgstr "删除版本库统计时发生错误" - -#: rhodecode/controllers/admin/repos.py:443 -msgid "Error occurred during deleting issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:446 -#: rhodecode/controllers/admin/settings.py:384 -msgid "Removed issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:476 -#: rhodecode/controllers/admin/settings.py:431 -msgid "Updated issue tracker entries" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:537 -#: rhodecode/controllers/admin/settings.py:147 -#: rhodecode/controllers/admin/settings.py:622 -msgid "Some form inputs contain invalid data." -msgstr "" - -#: rhodecode/controllers/admin/repos.py:555 -msgid "Error occurred during updating repository VCS settings" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:559 -#: rhodecode/controllers/admin/settings.py:176 -msgid "Updated VCS settings" -msgstr "成功更新版本控制系统设置" - #: rhodecode/controllers/admin/settings.py:172 #: rhodecode/controllers/admin/settings.py:286 msgid "Error occurred during updating application settings" @@ -1339,205 +1526,59 @@ msgstr "" msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:164 -#, python-format -msgid "Created user group %(user_group_link)s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:178 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:218 -#, python-format -msgid "Updated user group %s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:234 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:253 -msgid "Successfully deleted user group" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:258 -msgid "An error occurred during deletion of user group" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:326 -msgid "Target group cannot be the same" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:332 -msgid "User Group permissions updated" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:415 -msgid "User Group global permissions updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:430 -#: rhodecode/controllers/admin/users.py:477 -msgid "An error occurred during permissions saving" -msgstr "保存权限时发生错误" - -#: rhodecode/controllers/admin/user_groups.py:474 -msgid "User Group synchronization updated successfully" -msgstr "" - -#: rhodecode/controllers/admin/user_groups.py:478 -msgid "An error occurred during synchronization update" -msgstr "" - -#: rhodecode/controllers/admin/users.py:108 -#, python-format -msgid "Created user %(user_link)s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:124 -#, python-format -msgid "Error occurred during creation of user %s" -msgstr "" - -#: rhodecode/controllers/admin/users.py:166 -msgid "User updated successfully" -msgstr "用户更新成功" - -#: rhodecode/controllers/admin/users.py:209 -#, python-format -msgid "Detached %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:214 -#, python-format -msgid "Deleted %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:222 -#, python-format -msgid "Detached %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:227 -#, python-format -msgid "Deleted %s repository groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:235 -#, python-format -msgid "Detached %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:240 -#, python-format -msgid "Deleted %s user groups" -msgstr "" - -#: rhodecode/controllers/admin/users.py:257 -msgid "Successfully deleted user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:263 -msgid "An error occurred during deletion of user" -msgstr "删除用户时发生错误" - -#: rhodecode/controllers/admin/users.py:280 -msgid "Force password change disabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:285 -msgid "Force password change enabled for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:294 -msgid "An error occurred during password reset for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:325 -#, python-format -msgid "Linked repository group `%s` as personal" -msgstr "" - -#: rhodecode/controllers/admin/users.py:331 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/controllers/admin/users.py:335 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - -#: rhodecode/controllers/admin/users.py:340 -msgid "An error occurred during repository group creation for user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:396 -msgid "" -"The user participates as reviewer in pull requests and cannot be deleted. " -"You can set the user to \"inactive\" instead of deleting it." -msgstr "" - -#: rhodecode/controllers/admin/users.py:462 -msgid "User global permissions updated successfully" -msgstr "" - -#: rhodecode/events/pullrequest.py:71 +#: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:81 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:89 +#: rhodecode/events/pullrequest.py:90 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:98 +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:107 +#: rhodecode/events/pullrequest.py:108 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:116 +#: rhodecode/events/pullrequest.py:117 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:148 +#: rhodecode/events/repo.py:149 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:157 +#: rhodecode/events/repo.py:158 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:166 +#: rhodecode/events/repo.py:167 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:175 +#: rhodecode/events/repo.py:176 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:211 +#: rhodecode/events/repo.py:216 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:220 +#: rhodecode/events/repo.py:225 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:229 +#: rhodecode/events/repo.py:234 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:240 +#: rhodecode/events/repo.py:245 msgid "repository push" msgstr "" @@ -1573,54 +1614,60 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:201 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 -#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/settings/settings_visual.mako:211 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "重置" -#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49 -#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54 +#: rhodecode/templates/admin/integrations/list.mako:215 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/notifications/notifications_data.mako:22 +#: rhodecode/templates/admin/notifications/notifications_show.mako:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 #: rhodecode/templates/base/issue_tracker_settings.mako:69 -#: rhodecode/templates/base/vcs_settings.mako:264 -#: rhodecode/templates/base/vcs_settings.mako:289 +#: rhodecode/templates/base/vcs_settings.mako:244 +#: rhodecode/templates/base/vcs_settings.mako:269 #: rhodecode/templates/changeset/changeset_file_comment.mako:142 #: rhodecode/templates/changeset/changeset_file_comment.mako:144 #: rhodecode/templates/changeset/changeset_file_comment.mako:147 -#: rhodecode/templates/data_table/_dt_elements.mako:123 -#: rhodecode/templates/data_table/_dt_elements.mako:184 -#: rhodecode/templates/data_table/_dt_elements.mako:198 -#: rhodecode/templates/data_table/_dt_elements.mako:210 +#: rhodecode/templates/data_table/_dt_elements.mako:171 +#: rhodecode/templates/data_table/_dt_elements.mako:244 +#: rhodecode/templates/data_table/_dt_elements.mako:258 +#: rhodecode/templates/data_table/_dt_elements.mako:270 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:45 -#: rhodecode/templates/files/files_source.mako:49 -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:55 +#: rhodecode/templates/files/files_source.mako:58 #: rhodecode/templates/pullrequests/pullrequest_show.mako:56 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" @@ -1659,28 +1706,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:160 +#: rhodecode/integrations/views.py:148 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:163 +#: rhodecode/integrations/views.py:151 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:170 +#: rhodecode/integrations/views.py:158 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:184 +#: rhodecode/integrations/views.py:173 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:264 +#: rhodecode/integrations/views.py:301 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:289 +#: rhodecode/integrations/views.py:326 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1764,17 +1811,19 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 -#: rhodecode/templates/admin/admin_log_base.mako:6 +#: rhodecode/integrations/types/slack.py:60 +#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/templates/login.mako:43 rhodecode/templates/register.mako:41 +#: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:63 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:315 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1810,132 +1859,158 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:164 +#: rhodecode/integrations/types/webhook.py:177 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:166 -msgid "" -"URL of the webhook to receive POST event. Following variables are allowed to" -" be used: {vars}. Some of the variables would trigger multiple calls, like " +#: rhodecode/integrations/types/webhook.py:179 +msgid "" +"URL to which Webhook should submit data. Following variables are allowed to " +"be used: {vars}. Some of the variables would trigger multiple calls, like " "${{branch}} or ${{commit_id}}. Webhook will be called as many times as " "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:193 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 -msgid "String used to validate received payloads." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:190 -msgid "Call Method" -msgstr "" - -#: rhodecode/integrations/types/webhook.py:191 -msgid "Select if the webhook call should be made with POST or GET." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:204 -msgid "Webhook" +#: rhodecode/integrations/types/webhook.py:194 +msgid "" +"Optional string used to validate received payloads. It will be sent together" +" with event data in JSON" msgstr "" #: rhodecode/integrations/types/webhook.py:205 -msgid "Post json events to a webhook endpoint" -msgstr "" - -#: rhodecode/lib/action_parser.py:94 +msgid "Optional username to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:215 +msgid "Optional password to authenticate the call." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:225 +msgid "Custom Header Key" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:226 +msgid "Custom Header name to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:235 +msgid "Custom Header Value" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:236 +msgid "Custom Header value to be set when calling endpoint." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:245 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:246 +msgid "Select if the Webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:259 +msgid "Webhook" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:260 +msgid "Post json events to a Webhook endpoint" +msgstr "" + +#: rhodecode/lib/action_parser.py:93 msgid "[deleted] repository" msgstr "[删除]版本库" -#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115 +#: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114 msgid "[created] repository" msgstr "[创建]版本库" -#: rhodecode/lib/action_parser.py:100 +#: rhodecode/lib/action_parser.py:99 msgid "[created] repository as fork" msgstr "[创建]复刻版本库" -#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118 +#: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117 msgid "[forked] repository" msgstr "[复刻]版本库" -#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121 +#: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120 msgid "[updated] repository" msgstr "[更新]版本库" -#: rhodecode/lib/action_parser.py:109 +#: rhodecode/lib/action_parser.py:108 msgid "[downloaded] archive from repository" msgstr "" -#: rhodecode/lib/action_parser.py:112 +#: rhodecode/lib/action_parser.py:111 msgid "[delete] repository" msgstr "[删除]版本库" -#: rhodecode/lib/action_parser.py:124 +#: rhodecode/lib/action_parser.py:123 msgid "[created] user" msgstr "[创建]用户" -#: rhodecode/lib/action_parser.py:127 +#: rhodecode/lib/action_parser.py:126 msgid "[updated] user" msgstr "[更新]用户" -#: rhodecode/lib/action_parser.py:130 +#: rhodecode/lib/action_parser.py:129 msgid "[created] user group" msgstr "" -#: rhodecode/lib/action_parser.py:133 +#: rhodecode/lib/action_parser.py:132 msgid "[updated] user group" msgstr "" -#: rhodecode/lib/action_parser.py:136 +#: rhodecode/lib/action_parser.py:135 msgid "[commented] on commit in repository" msgstr "" -#: rhodecode/lib/action_parser.py:139 +#: rhodecode/lib/action_parser.py:138 msgid "[commented] on pull request for" msgstr "[评论]拉取请求" -#: rhodecode/lib/action_parser.py:142 +#: rhodecode/lib/action_parser.py:141 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: rhodecode/lib/action_parser.py:145 +#: rhodecode/lib/action_parser.py:144 msgid "[merged] pull request for" msgstr "" -#: rhodecode/lib/action_parser.py:148 +#: rhodecode/lib/action_parser.py:147 msgid "[pushed] into" msgstr "[推送]到" -#: rhodecode/lib/action_parser.py:151 +#: rhodecode/lib/action_parser.py:150 msgid "[committed via RhodeCode] into repository" msgstr "[通过RhodeCode提交]到版本库" -#: rhodecode/lib/action_parser.py:154 +#: rhodecode/lib/action_parser.py:153 msgid "[pulled from remote] into repository" msgstr "[远程拉取]到版本库" -#: rhodecode/lib/action_parser.py:157 +#: rhodecode/lib/action_parser.py:156 msgid "[pulled] from" msgstr "[拉取]自" -#: rhodecode/lib/action_parser.py:160 +#: rhodecode/lib/action_parser.py:159 msgid "[started following] repository" msgstr "[开始关注]版本库" -#: rhodecode/lib/action_parser.py:163 +#: rhodecode/lib/action_parser.py:162 msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: rhodecode/lib/action_parser.py:172 +#: rhodecode/lib/action_parser.py:171 #, python-format msgid "fork name %s" msgstr "复刻名称 %s" -#: rhodecode/lib/action_parser.py:190 +#: rhodecode/lib/action_parser.py:189 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" @@ -1946,52 +2021,42 @@ msgstr "拉取请求 #%s" msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:227 +#: rhodecode/lib/action_parser.py:228 msgid "compare view" msgstr "比较显示" -#: rhodecode/lib/action_parser.py:234 +#: rhodecode/lib/action_parser.py:235 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:286 +#: rhodecode/lib/action_parser.py:288 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支 %s" -#: rhodecode/lib/action_parser.py:289 +#: rhodecode/lib/action_parser.py:291 #, python-format msgid "Created tag: %s" msgstr "创建标签 %s" -#: rhodecode/lib/action_parser.py:302 +#: rhodecode/lib/action_parser.py:304 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1220 +#: rhodecode/lib/auth.py:1445 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1309 +#: rhodecode/lib/auth.py:1535 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: rhodecode/lib/auth.py:1366 -#, python-format -msgid "Action not supported for %s." -msgstr "" - -#: rhodecode/lib/auth.py:1412 +#: rhodecode/lib/auth.py:1577 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:561 -#, python-format -msgid "The repository at %(repo_name)s cannot be located." -msgstr "" - #: rhodecode/lib/diffs.py:62 msgid "Click to comment" msgstr "" @@ -2009,20 +2074,11 @@ msgstr "修订集因过大而被截断，可查看原始修订集作为替代" msgid "No changes detected" msgstr "未发现差异" -#: rhodecode/lib/diffs.py:921 +#: rhodecode/lib/diffs.py:927 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1527 -#, python-format -msgid " and %s more" -msgstr "还有 %s 个" - -#: rhodecode/lib/helpers.py:1531 -msgid "No Files" -msgstr "没有文件" - -#: rhodecode/lib/helpers.py:1836 +#: rhodecode/lib/helpers.py:1869 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2042,7 +2098,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1859 +#: rhodecode/lib/helpers.py:1893 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2056,54 +2112,54 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1875 +#: rhodecode/lib/helpers.py:1910 #, 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 没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" -#: rhodecode/lib/utils2.py:486 +#: rhodecode/lib/utils2.py:525 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:492 +#: rhodecode/lib/utils2.py:531 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:501 +#: rhodecode/lib/utils2.py:540 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:503 +#: rhodecode/lib/utils2.py:542 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:505 +#: rhodecode/lib/utils2.py:544 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:507 +#: rhodecode/lib/utils2.py:546 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:509 +#: rhodecode/lib/utils2.py:548 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:511 +#: rhodecode/lib/utils2.py:550 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:515 -#: rhodecode/public/js/rhodecode-components.js:33659 -#: rhodecode/public/js/scripts.js:25507 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/lib/utils2.py:554 +#: rhodecode/public/js/rhodecode-components.js:29149 +#: rhodecode/public/js/scripts.js:20997 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "刚刚" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684 @@ -2120,24 +2176,25 @@ msgstr "刚刚" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/model/db.py:2482 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 +#: rhodecode/model/db.py:2595 msgid "Repository no access" msgstr "无版本库访问权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685 @@ -2154,24 +2211,25 @@ msgstr "无版本库访问权限" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/model/db.py:2483 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 +#: rhodecode/model/db.py:2596 msgid "Repository read access" msgstr "版本库读取权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686 @@ -2188,24 +2246,25 @@ msgstr "版本库读取权限" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/model/db.py:2484 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 +#: rhodecode/model/db.py:2597 msgid "Repository write access" msgstr "版本库写入权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687 @@ -2222,48 +2281,49 @@ msgstr "版本库写入权限" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/model/db.py:2485 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 +#: rhodecode/model/db.py:2598 msgid "Repository admin access" msgstr "版本库管理权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604 msgid "Repositories Group no access" msgstr "无版本库组访问权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605 msgid "Repositories Group read access" msgstr "版本库组读取权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606 msgid "Repositories Group write access" msgstr "版本库组写入" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607 msgid "Repositories Group admin access" msgstr "版本库组管理权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694 @@ -2279,7 +2339,7 @@ msgstr "版本库组管理权限" msgid "RhodeCode Administrator" msgstr "RhodeCode 管理员" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695 @@ -2296,24 +2356,25 @@ msgstr "RhodeCode 管理员" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/model/db.py:2503 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 +#: rhodecode/model/db.py:2616 msgid "Repository creation disabled" msgstr "禁用创建版本库" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696 @@ -2330,24 +2391,25 @@ msgstr "禁用创建版本库" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/model/db.py:2504 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 +#: rhodecode/model/db.py:2617 msgid "Repository creation enabled" msgstr "允许创建版本库" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697 @@ -2364,24 +2426,25 @@ msgstr "允许创建版本库" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 -#: rhodecode/model/db.py:2508 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 +#: rhodecode/model/db.py:2621 msgid "Repository forking disabled" msgstr "禁用复刻版本库" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698 @@ -2398,45 +2461,46 @@ msgstr "禁用复刻版本库" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/model/db.py:2509 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 +#: rhodecode/model/db.py:2622 msgid "Repository forking enabled" msgstr "允许复刻版本库" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699 msgid "Register disabled" msgstr "禁用注册" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700 msgid "Register new user with RhodeCode with manual activation" msgstr "用手动激活注册新用户" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:588 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703 msgid "Register new user with RhodeCode with auto activation" msgstr "用自动激活注册新用户" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959 @@ -2453,24 +2517,25 @@ msgstr "用自动激活注册新用户" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 -#: rhodecode/model/db.py:3212 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 +#: rhodecode/model/db.py:3324 msgid "Not Reviewed" msgstr "未检视" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960 @@ -2487,24 +2552,25 @@ msgstr "未检视" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 -#: rhodecode/model/db.py:3213 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 +#: rhodecode/model/db.py:3325 msgid "Approved" msgstr "已批准" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961 @@ -2521,24 +2587,25 @@ msgstr "已批准" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 -#: rhodecode/model/db.py:3214 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 +#: rhodecode/model/db.py:3326 msgid "Rejected" msgstr "驳回" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962 @@ -2555,20 +2622,21 @@ msgstr "驳回" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 -#: rhodecode/model/db.py:3215 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 +#: rhodecode/model/db.py:3327 msgid "Under Review" msgstr "检视中" @@ -2586,20 +2654,21 @@ msgstr "检视中" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/model/db.py:2487 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 +#: rhodecode/model/db.py:2600 msgid "Repository group no access" msgstr "" @@ -2617,20 +2686,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/model/db.py:2488 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 +#: rhodecode/model/db.py:2601 msgid "Repository group read access" msgstr "" @@ -2648,20 +2718,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/model/db.py:2489 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 +#: rhodecode/model/db.py:2602 msgid "Repository group write access" msgstr "" @@ -2679,20 +2750,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/model/db.py:2490 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 +#: rhodecode/model/db.py:2603 msgid "Repository group admin access" msgstr "" @@ -2709,20 +2781,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/model/db.py:2492 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 +#: rhodecode/model/db.py:2605 msgid "User group no access" msgstr "" @@ -2739,20 +2812,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/model/db.py:2493 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 +#: rhodecode/model/db.py:2606 msgid "User group read access" msgstr "" @@ -2769,20 +2843,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/model/db.py:2494 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 +#: rhodecode/model/db.py:2607 msgid "User group write access" msgstr "" @@ -2799,20 +2874,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/model/db.py:2495 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 +#: rhodecode/model/db.py:2608 msgid "User group admin access" msgstr "" @@ -2829,20 +2905,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/model/db.py:2497 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 +#: rhodecode/model/db.py:2610 msgid "Repository Group creation disabled" msgstr "" @@ -2859,20 +2936,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/model/db.py:2498 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 +#: rhodecode/model/db.py:2611 msgid "Repository Group creation enabled" msgstr "" @@ -2889,20 +2967,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/model/db.py:2500 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 +#: rhodecode/model/db.py:2613 msgid "User Group creation disabled" msgstr "" @@ -2919,20 +2998,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/model/db.py:2501 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 +#: rhodecode/model/db.py:2614 msgid "User Group creation enabled" msgstr "" @@ -2949,20 +3029,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/model/db.py:2511 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 +#: rhodecode/model/db.py:2624 msgid "Registration disabled" msgstr "" @@ -2979,20 +3060,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 -#: rhodecode/model/db.py:2512 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 +#: rhodecode/model/db.py:2625 msgid "User Registration with manual account activation" msgstr "" @@ -3009,20 +3091,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/model/db.py:2513 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 +#: rhodecode/model/db.py:2626 msgid "User Registration with automatic account activation" msgstr "" @@ -3039,20 +3122,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 -#: rhodecode/model/db.py:2519 rhodecode/model/permission.py:95 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 +#: rhodecode/model/db.py:2632 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "" @@ -3069,20 +3153,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 -#: rhodecode/model/db.py:2520 rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 +#: rhodecode/model/db.py:2633 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "" @@ -3093,20 +3178,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/model/db.py:2505 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 +#: rhodecode/model/db.py:2618 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3118,20 +3204,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/model/db.py:2506 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 +#: rhodecode/model/db.py:2619 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3140,79 +3227,74 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/model/db.py:2480 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:814 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:815 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 +#: rhodecode/model/db.py:2593 msgid "RhodeCode Super Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852 +#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853 +#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 +#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 +#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 +#: rhodecode/model/db.py:2635 +msgid "Inherit object permissions from default user disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 +#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 -#: rhodecode/model/db.py:2522 -msgid "Inherit object permissions from default user disabled" -msgstr "" - -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812 -#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854 -#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855 -#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861 -#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 -#: rhodecode/model/db.py:2523 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 +#: rhodecode/model/db.py:2636 msgid "Inherit object permissions from default user enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:954 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043 -msgid "all" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044 -msgid "http/web interface" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 +#: rhodecode/model/db.py:1099 +msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 @@ -3221,8 +3303,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045 -msgid "vcs (git/hg/svn protocol)" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 +#: rhodecode/model/db.py:1100 +msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 @@ -3231,8 +3315,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046 -msgid "api calls" +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 +#: rhodecode/model/db.py:1101 +msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 @@ -3241,36 +3327,54 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 +#: rhodecode/model/db.py:1102 +msgid "api calls" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 +#: rhodecode/model/db.py:1103 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 -#: rhodecode/model/db.py:2248 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 +#: rhodecode/model/db.py:2356 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 -#: rhodecode/model/db.py:2515 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 +#: rhodecode/model/db.py:2628 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/model/db.py:2516 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 +#: rhodecode/model/db.py:2629 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/model/db.py:2517 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 +#: rhodecode/model/db.py:2630 msgid "Password reset disabled" msgstr "" @@ -3306,112 +3410,128 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/model/comment.py:374 -msgid "made a comment" +#: rhodecode/model/auth_token.py:53 +msgid "5 minutes {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:55 +msgid "1 hour {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:57 +msgid "1 day {end_date}" +msgstr "" + +#: rhodecode/model/auth_token.py:59 +msgid "1 month {end_date}" msgstr "" #: rhodecode/model/comment.py:375 +msgid "made a comment" +msgstr "" + +#: rhodecode/model/comment.py:376 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:85 +#: rhodecode/model/forms.py:87 msgid "Please enter a login" msgstr "请登录" -#: rhodecode/model/forms.py:86 +#: rhodecode/model/forms.py:88 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "输入一个不少于%(min)i个字符的值" -#: rhodecode/model/forms.py:95 +#: rhodecode/model/forms.py:98 msgid "Please enter a password" msgstr "请输入密码" -#: rhodecode/model/forms.py:96 +#: rhodecode/model/forms.py:99 #, python-format msgid "Enter %(min)i characters or more" msgstr "输入至少%(min)i个字符" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:245 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:248 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:252 +#: rhodecode/model/notification.py:250 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:256 +#: rhodecode/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:260 +#: rhodecode/model/notification.py:258 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:264 +#: rhodecode/model/notification.py:262 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:268 +#: rhodecode/model/notification.py:266 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 -#: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 +#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 +#: rhodecode/model/permission.py:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "无" -#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 -#: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 +#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 +#: rhodecode/model/permission.py:81 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "读" -#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 -#: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 #: rhodecode/templates/changeset/changeset_file_comment.mako:271 @@ -3419,8 +3539,8 @@ msgstr "读" msgid "Write" msgstr "写" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3434,7 +3554,7 @@ msgstr "写" #: rhodecode/templates/admin/permissions/permissions.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:13 #: rhodecode/templates/admin/repos/repo_add.mako:17 @@ -3449,189 +3569,189 @@ msgstr "写" #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:412 -#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:417 +#: rhodecode/templates/base/base.mako:424 msgid "Admin" msgstr "管理" -#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 -#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 +#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 +#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 +#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 +#: rhodecode/model/permission.py:120 msgid "Disabled" msgstr "停用" -#: rhodecode/model/permission.py:86 +#: rhodecode/model/permission.py:87 msgid "Allowed with manual account activation" msgstr "" -#: rhodecode/model/permission.py:87 +#: rhodecode/model/permission.py:88 msgid "Allowed with automatic account activation" msgstr "" -#: rhodecode/model/permission.py:90 -msgid "Allow password recovery" -msgstr "" - #: rhodecode/model/permission.py:91 -msgid "Hide password recovery link" +msgid "Allow password recovery" msgstr "" #: rhodecode/model/permission.py:92 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:93 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:80 +#: rhodecode/model/pull_request.py:79 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:81 msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:84 msgid "This pull request cannot be merged because of merge conflicts." msgstr "" -#: rhodecode/model/pull_request.py:87 +#: rhodecode/model/pull_request.py:86 msgid "This pull request could not be merged because push to target failed." msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:89 msgid "This pull request cannot be merged because the target is not a head." msgstr "" -#: rhodecode/model/pull_request.py:93 +#: rhodecode/model/pull_request.py:92 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:95 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:98 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:101 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:105 +#: rhodecode/model/pull_request.py:104 msgid "" "This pull request cannot be merged because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:108 +#: rhodecode/model/pull_request.py:107 msgid "" "This pull request cannot be merged because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:111 +#: rhodecode/model/pull_request.py:110 msgid "" "This pull request cannot be merged because of conflicts related to sub " "repositories." msgstr "" -#: rhodecode/model/pull_request.py:117 +#: rhodecode/model/pull_request.py:116 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:119 +#: rhodecode/model/pull_request.py:118 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:121 +#: rhodecode/model/pull_request.py:120 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:123 +#: rhodecode/model/pull_request.py:122 msgid "" "Pull request cannot be updated because the reference type is not supported " "for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:126 +#: rhodecode/model/pull_request.py:125 msgid "" "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:129 +#: rhodecode/model/pull_request.py:128 msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:544 -#, python-format -msgid "" -"Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" -"\n" -" %(pr_title)s" -msgstr "" - -#: rhodecode/model/pull_request.py:576 -msgid "Pull request merged and closed" -msgstr "" - -#: rhodecode/model/pull_request.py:1108 -msgid "Closing with status change {transition_icon} {status}." -msgstr "" - -#: rhodecode/model/pull_request.py:1152 -msgid "Server-side pull request merging is disabled." -msgstr "" - -#: rhodecode/model/pull_request.py:1154 -msgid "This pull request is closed." -msgstr "" - #: rhodecode/model/pull_request.py:1166 +msgid "Server-side pull request merging is disabled." +msgstr "" + +#: rhodecode/model/pull_request.py:1168 +msgid "This pull request is closed." +msgstr "" + +#: rhodecode/model/pull_request.py:1181 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1184 +#: rhodecode/model/pull_request.py:1200 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1187 +#: rhodecode/model/pull_request.py:1203 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783 +#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 msgid "Bookmarks" msgstr "书签" -#: rhodecode/model/pull_request.py:1349 +#: rhodecode/model/pull_request.py:1370 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1352 +#: rhodecode/model/pull_request.py:1373 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1493 +#: rhodecode/model/pull_request.py:1533 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1506 +#: rhodecode/model/pull_request.py:1546 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1521 +#: rhodecode/model/pull_request.py:1561 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1524 +#: rhodecode/model/pull_request.py:1564 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/scm.py:761 +#: rhodecode/model/pull_request.py:1599 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:1604 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:1611 +msgid "Source branch will be closed after merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1613 +msgid "Source branch will be deleted after merge." +msgstr "" + +#: rhodecode/model/scm.py:762 msgid "latest tip" msgstr "最新tip" @@ -3639,32 +3759,32 @@ msgstr "最新tip" msgid "You can't Edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/model/user.py:332 +#: rhodecode/model/user.py:333 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:502 +#: rhodecode/model/user.py:506 msgid "You can't remove this user since it's crucial for entire application" msgstr "由于是系统帐号，无法删除该用户" -#: rhodecode/model/user.py:510 +#: rhodecode/model/user.py:514 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "" -#: rhodecode/model/user.py:519 +#: rhodecode/model/user.py:523 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "" -#: rhodecode/model/user.py:528 +#: rhodecode/model/user.py:532 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3716,7 +3836,7 @@ msgstr "" #: rhodecode/model/validators.py:224 #, python-format -msgid "User group \"%(usergroup)s\" already exists" +msgid "User group `%(usergroup)s` already exists" msgstr "" #: rhodecode/model/validators.py:226 @@ -3963,27 +4083,27 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "" "You do not have the permission to store repository groups in the root " "location." msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:113 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4023,440 +4143,454 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:31663 -#: rhodecode/public/js/scripts.js:23511 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:27153 +#: rhodecode/public/js/scripts.js:19001 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33594 -#: rhodecode/public/js/scripts.js:25442 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:29084 +#: rhodecode/public/js/scripts.js:20932 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33595 -#: rhodecode/public/js/scripts.js:25443 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 +#: rhodecode/public/js/rhodecode-components.js:29085 +#: rhodecode/public/js/scripts.js:20933 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33596 -#: rhodecode/public/js/scripts.js:25444 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/rhodecode-components.js:29086 +#: rhodecode/public/js/scripts.js:20934 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33597 -#: rhodecode/public/js/scripts.js:25445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode-components.js:29087 +#: rhodecode/public/js/scripts.js:20935 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33598 -#: rhodecode/public/js/scripts.js:25446 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 +#: rhodecode/public/js/rhodecode-components.js:29088 +#: rhodecode/public/js/scripts.js:20936 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33599 -#: rhodecode/public/js/scripts.js:25447 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:29089 +#: rhodecode/public/js/scripts.js:20937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33619 -#: rhodecode/public/js/scripts.js:25467 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode-components.js:29109 +#: rhodecode/public/js/scripts.js:20957 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33627 -#: rhodecode/public/js/scripts.js:25475 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/rhodecode-components.js:29117 +#: rhodecode/public/js/scripts.js:20965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33639 -#: rhodecode/public/js/scripts.js:25487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:29129 +#: rhodecode/public/js/scripts.js:20977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33641 -#: rhodecode/public/js/scripts.js:25489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode-components.js:29131 +#: rhodecode/public/js/scripts.js:20979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33645 -#: rhodecode/public/js/scripts.js:25493 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/public/js/rhodecode-components.js:29135 +#: rhodecode/public/js/scripts.js:20983 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33647 -#: rhodecode/public/js/scripts.js:25495 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode-components.js:29137 +#: rhodecode/public/js/scripts.js:20985 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:33649 -#: rhodecode/public/js/scripts.js:25497 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode-components.js:29139 +#: rhodecode/public/js/scripts.js:20987 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47492 -#: rhodecode/public/js/scripts.js:39340 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:43198 +#: rhodecode/public/js/scripts.js:35046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47495 -#: rhodecode/public/js/scripts.js:39343 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:43201 +#: rhodecode/public/js/scripts.js:35049 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47498 -#: rhodecode/public/js/scripts.js:39346 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:43204 +#: rhodecode/public/js/scripts.js:35052 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47501 -#: rhodecode/public/js/scripts.js:39349 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/rhodecode-components.js:43207 +#: rhodecode/public/js/scripts.js:35055 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47505 -#: rhodecode/public/js/scripts.js:39353 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:43211 +#: rhodecode/public/js/scripts.js:35059 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47507 -#: rhodecode/public/js/scripts.js:39355 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:43213 +#: rhodecode/public/js/scripts.js:35061 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47512 -#: rhodecode/public/js/scripts.js:39360 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:43218 +#: rhodecode/public/js/scripts.js:35066 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47514 -#: rhodecode/public/js/scripts.js:39362 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:43220 +#: rhodecode/public/js/scripts.js:35068 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47519 -#: rhodecode/public/js/scripts.js:39367 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:43225 +#: rhodecode/public/js/scripts.js:35073 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47521 -#: rhodecode/public/js/scripts.js:39369 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:43227 +#: rhodecode/public/js/scripts.js:35075 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47525 -#: rhodecode/public/js/scripts.js:39373 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:43231 +#: rhodecode/public/js/scripts.js:35079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47527 -#: rhodecode/public/js/scripts.js:39375 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:43233 +#: rhodecode/public/js/scripts.js:35081 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48456 -#: rhodecode/public/js/scripts.js:40304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 +#: rhodecode/public/js/rhodecode-components.js:44167 +#: rhodecode/public/js/scripts.js:36015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48458 -#: rhodecode/public/js/scripts.js:40306 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/rhodecode-components.js:44169 +#: rhodecode/public/js/scripts.js:36017 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48891 -#: rhodecode/public/js/scripts.js:40739 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -#: rhodecode/public/js/src/rhodecode/codemirror.js:296 +#: rhodecode/public/js/rhodecode-components.js:44615 +#: rhodecode/public/js/scripts.js:36463 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48910 -#: rhodecode/public/js/scripts.js:40758 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/codemirror.js:315 +#: rhodecode/public/js/rhodecode-components.js:44634 +#: rhodecode/public/js/scripts.js:36482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48929 -#: rhodecode/public/js/scripts.js:40777 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +#: rhodecode/public/js/rhodecode-components.js:44653 +#: rhodecode/public/js/scripts.js:36501 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/codemirror.js:335 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48949 -#: rhodecode/public/js/scripts.js:40797 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +#: rhodecode/public/js/rhodecode-components.js:44673 +#: rhodecode/public/js/scripts.js:36521 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49315 -#: rhodecode/public/js/scripts.js:41163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:125 +#: rhodecode/public/js/rhodecode-components.js:45040 +#: rhodecode/public/js/scripts.js:36888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49399 -#: rhodecode/public/js/scripts.js:41247 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/comments.js:209 +#: rhodecode/public/js/rhodecode-components.js:45124 +#: rhodecode/public/js/scripts.js:36972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49414 -#: rhodecode/public/js/scripts.js:41262 +#: rhodecode/public/js/rhodecode-components.js:45139 +#: rhodecode/public/js/scripts.js:36987 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/comments.js:224 +#: rhodecode/public/js/src/rhodecode/comments.js:225 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49571 -#: rhodecode/public/js/scripts.js:41419 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -#: rhodecode/public/js/src/rhodecode/comments.js:381 +#: rhodecode/public/js/rhodecode-components.js:45296 +#: rhodecode/public/js/scripts.js:37144 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "提交中……" -#: rhodecode/public/js/rhodecode-components.js:49622 -#: rhodecode/public/js/scripts.js:41470 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/comments.js:432 +#: rhodecode/public/js/rhodecode-components.js:45347 +#: rhodecode/public/js/scripts.js:37195 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:433 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49727 -#: rhodecode/public/js/scripts.js:41575 +#: rhodecode/public/js/rhodecode-components.js:45452 +#: rhodecode/public/js/scripts.js:37300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:537 +#: rhodecode/public/js/src/rhodecode/comments.js:538 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49798 -#: rhodecode/public/js/scripts.js:41646 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode-components.js:45522 +#: rhodecode/public/js/scripts.js:37370 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/rhodecode/comments.js:608 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49875 -#: rhodecode/public/js/scripts.js:41723 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:45599 +#: rhodecode/public/js/scripts.js:37447 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/comments.js:685 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49989 -#: rhodecode/public/js/scripts.js:41837 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:45713 +#: rhodecode/public/js/scripts.js:37561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/rhodecode/comments.js:799 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50195 -#: rhodecode/public/js/scripts.js:42043 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode-components.js:45919 +#: rhodecode/public/js/scripts.js:37767 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50197 -#: rhodecode/public/js/scripts.js:42045 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode-components.js:45921 +#: rhodecode/public/js/scripts.js:37769 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50206 -#: rhodecode/public/js/scripts.js:42054 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:45930 +#: rhodecode/public/js/scripts.js:37778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50341 -#: rhodecode/public/js/scripts.js:42189 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:46065 +#: rhodecode/public/js/scripts.js:37913 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "选择链接" -#: rhodecode/public/js/rhodecode-components.js:50381 -#: rhodecode/public/js/scripts.js:42229 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:46105 +#: rhodecode/public/js/scripts.js:37953 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "停止关注该版本库" -#: rhodecode/public/js/rhodecode-components.js:50382 -#: rhodecode/public/js/scripts.js:42230 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:46106 +#: rhodecode/public/js/scripts.js:37954 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50391 -#: rhodecode/public/js/scripts.js:42239 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:46115 +#: rhodecode/public/js/scripts.js:37963 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "开始关注该版本库" -#: rhodecode/public/js/rhodecode-components.js:50392 -#: rhodecode/public/js/scripts.js:42240 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode-components.js:46116 +#: rhodecode/public/js/scripts.js:37964 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50770 -#: rhodecode/public/js/rhodecode-components.js:50779 -#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627 +#: rhodecode/public/js/rhodecode-components.js:46496 +#: rhodecode/public/js/rhodecode-components.js:46505 +#: rhodecode/public/js/scripts.js:38344 rhodecode/public/js/scripts.js:38353 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50784 -#: rhodecode/public/js/scripts.js:42632 +#: rhodecode/public/js/rhodecode-components.js:46510 +#: rhodecode/public/js/scripts.js:38358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50790 -#: rhodecode/public/js/scripts.js:42638 +#: rhodecode/public/js/rhodecode-components.js:46516 +#: rhodecode/public/js/scripts.js:38364 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50797 -#: rhodecode/public/js/scripts.js:42645 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:46523 +#: rhodecode/public/js/scripts.js:38371 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/src/rhodecode/pullrequests.js:161 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50804 -#: rhodecode/public/js/scripts.js:42652 +#: rhodecode/public/js/rhodecode-components.js:46530 +#: rhodecode/public/js/scripts.js:38378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:168 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50811 -#: rhodecode/public/js/scripts.js:42659 +#: rhodecode/public/js/rhodecode-components.js:46537 +#: rhodecode/public/js/scripts.js:38385 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:175 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50825 -#: rhodecode/public/js/scripts.js:42673 +#: rhodecode/public/js/rhodecode-components.js:46551 +#: rhodecode/public/js/scripts.js:38399 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/src/rhodecode/pullrequests.js:189 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50972 -#: rhodecode/public/js/scripts.js:42820 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode-components.js:46698 +#: rhodecode/public/js/scripts.js:38546 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/rhodecode/pullrequests.js:336 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51099 -#: rhodecode/public/js/scripts.js:42947 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 +#: rhodecode/public/js/rhodecode-components.js:46823 +#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51101 -#: rhodecode/public/js/scripts.js:42949 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:465 +#: rhodecode/public/js/rhodecode-components.js:46825 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:463 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51682 -#: rhodecode/public/js/scripts.js:43530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:47404 +#: rhodecode/public/js/scripts.js:39252 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:51702 -#: rhodecode/public/js/scripts.js:43550 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode-components.js:47424 +#: rhodecode/public/js/scripts.js:39272 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "" +#: rhodecode/public/js/rhodecode-components.js:47805 +#: rhodecode/public/js/scripts.js:39653 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode.js:543 +msgid "date not in future" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47813 +#: rhodecode/public/js/scripts.js:39661 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/src/rhodecode.js:551 +msgid "Specified expiration date" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" @@ -4469,7 +4603,7 @@ msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:325 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" @@ -4477,141 +4611,159 @@ msgstr "" msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this " +"page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No branches available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No gists available yet." +msgid "No bookmarks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No branches available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/templates/changelog/changelog.mako:61 -msgid "Open new pull request" -msgstr "新建拉取请求" +msgid "No user groups available yet." +msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/templates/changelog/changelog.mako:59 +msgid "Open new pull request" +msgstr "新建拉取请求" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send" msgstr "发送" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Updating..." +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +msgid "" +"There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "禁用" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "files" msgstr "文件" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} years" msgstr "" @@ -4647,13 +4799,14 @@ msgstr "控制面板" #: rhodecode/templates/admin/gists/index.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 #: rhodecode/templates/admin/repos/repos.mako:12 #: rhodecode/templates/admin/user_groups/user_groups.mako:12 #: rhodecode/templates/admin/users/users.mako:12 #: rhodecode/templates/bookmarks/bookmarks.mako:12 #: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/journal/journal.mako:13 #: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "快速过滤..." @@ -4685,19 +4838,19 @@ msgid "Edit Repository Group" msgstr "" #: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:125 #: rhodecode/templates/admin/gists/index.mako:112 -#: rhodecode/templates/admin/integrations/list.mako:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/integrations/list.mako:106 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/admin/user_groups/user_groups.mako:61 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/base/perms_summary.mako:149 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4707,12 +4860,15 @@ msgid "Name" msgstr "名称" #: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:128 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 @@ -4720,13 +4876,15 @@ msgstr "名称" #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/user_groups/user_groups.mako:63 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 #: rhodecode/templates/base/issue_tracker_settings.mako:10 -#: rhodecode/templates/changeset/changeset.mako:73 +#: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 #: rhodecode/templates/email_templates/commit_comment.mako:89 #: rhodecode/templates/email_templates/pull_request_review.mako:41 @@ -4734,48 +4892,51 @@ msgstr "名称" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:163 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:487 -#: rhodecode/templates/summary/components.mako:73 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 +#: rhodecode/templates/summary/components.mako:82 msgid "Description" msgstr "描述" -#: rhodecode/templates/index_base.mako:102 -#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/index_base.mako:103 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 +#: rhodecode/templates/admin/repos/repos.mako:60 +msgid "Last Change" +msgstr "最后修改" + +#: rhodecode/templates/index_base.mako:105 +#: rhodecode/templates/index_base.mako:136 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:109 #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks_data.mako:7 -#: rhodecode/templates/summary/components.mako:195 +#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/summary/components.mako:203 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.mako:128 -#: rhodecode/templates/admin/repos/repos.mako:60 -msgid "Last Change" -msgstr "最后修改" - -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:134 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 -#: rhodecode/templates/changelog/changelog.mako:107 -#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/changelog/changelog.mako:116 +#: rhodecode/templates/changeset/changeset.mako:37 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:485 +#: rhodecode/templates/files/file_authors_box.mako:31 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4792,7 +4953,7 @@ msgid "Home" msgstr "首页" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "登录" @@ -4906,6 +5067,70 @@ msgstr "" msgid "Create Account" msgstr "" +#: rhodecode/templates/admin/admin_audit_log_entry.mako:6 +msgid "Admin audit log entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:13 +msgid "Audit long entry" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:31 +msgid "User" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:43 +#: rhodecode/templates/admin/admin_log_base.mako:11 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 +msgid "Date" +msgstr "日期" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:51 +#: rhodecode/templates/admin/admin_log_base.mako:12 +msgid "IP" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:60 +#: rhodecode/templates/admin/admin_log_base.mako:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/users/user_edit_groups.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/files/files_detail.mako:58 +#: rhodecode/templates/forks/forks.mako:79 +msgid "Action" +msgstr "操作" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:78 +#: rhodecode/templates/admin/admin_log_base.mako:9 +msgid "Action Data" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:86 +#: rhodecode/templates/admin/admin_log_base.mako:47 +msgid "data not available for v1 entries type" +msgstr "" + +#: rhodecode/templates/admin/admin_audit_log_entry.mako:92 +#: rhodecode/templates/admin/admin_log_base.mako:10 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 +msgid "Repository" +msgstr "版本库" + #: rhodecode/templates/admin/admin_audit_logs.mako:5 #: rhodecode/templates/base/base.mako:75 msgid "Admin audit logs" @@ -4916,68 +5141,34 @@ msgid "filter..." msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 msgid "filter" msgstr "过滤" #: rhodecode/templates/admin/admin_audit_logs.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 #: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:17 +#: rhodecode/templates/journal/journal.mako:18 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 -#: rhodecode/templates/admin/repos/repos.mako:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:68 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/users.mako:80 -#: rhodecode/templates/files/files_detail.mako:58 -msgid "Action" -msgstr "操作" - -#: rhodecode/templates/admin/admin_log_base.mako:8 -msgid "Action Data" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:9 -#: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 -#: rhodecode/templates/search/search_commit.mako:5 -#: rhodecode/templates/search/search_path.mako:3 -msgid "Repository" -msgstr "版本库" - -#: rhodecode/templates/admin/admin_log_base.mako:10 -#: rhodecode/templates/bookmarks/bookmarks.mako:61 -#: rhodecode/templates/branches/branches.mako:60 -#: rhodecode/templates/tags/tags.mako:61 -msgid "Date" -msgstr "日期" - -#: rhodecode/templates/admin/admin_log_base.mako:11 -msgid "IP" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:38 +#: rhodecode/templates/admin/admin_log_base.mako:6 +msgid "Uid" +msgstr "" + +#: rhodecode/templates/admin/admin_log_base.mako:42 msgid "toggle" msgstr "" -#: rhodecode/templates/admin/admin_log_base.mako:43 -msgid "data not available for v1 entries type" -msgstr "" - -#: rhodecode/templates/admin/admin_log_base.mako:64 +#: rhodecode/templates/admin/admin_log_base.mako:68 msgid "No actions yet" msgstr "无操作" @@ -5015,13 +5206,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 -#: rhodecode/templates/admin/repos/repo_add_base.mako:101 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:200 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 @@ -5049,21 +5240,21 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 -#: rhodecode/templates/admin/integrations/list.mako:103 -#: rhodecode/templates/admin/repos/repo_add_base.mako:75 +#: rhodecode/templates/admin/integrations/list.mako:107 +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "类型" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 +#: rhodecode/templates/admin/repos/repo_add_base.mako:98 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143 -#: rhodecode/templates/forks/fork.mako:87 +#: rhodecode/templates/admin/repos/repo_add_base.mako:102 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:149 +#: rhodecode/templates/forks/fork.mako:92 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -5118,7 +5309,7 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:56 #: rhodecode/templates/admin/gists/new.mako:50 #: rhodecode/templates/files/files_add.mako:80 -#: rhodecode/templates/files/files_edit.mako:78 +#: rhodecode/templates/files/files_edit.mako:81 msgid "plain" msgstr "" @@ -5129,15 +5320,15 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 #: rhodecode/templates/changeset/changeset_file_comment.mako:390 -#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 -#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/files/files_edit.mako:108 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "" -#: rhodecode/templates/admin/gists/edit.mako:122 +#: rhodecode/templates/admin/gists/edit.mako:125 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " @@ -5170,7 +5361,7 @@ msgid "All Public Gists" msgstr "" #: rhodecode/templates/admin/gists/index.mako:44 -#: rhodecode/templates/admin/gists/show.mako:36 +#: rhodecode/templates/admin/gists/show.mako:35 msgid "Create New Gist" msgstr "" @@ -5195,14 +5386,14 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.mako:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 #: rhodecode/templates/bookmarks/bookmarks.mako:63 #: rhodecode/templates/branches/branches.mako:62 -#: rhodecode/templates/changelog/changelog.mako:113 -#: rhodecode/templates/changeset/changeset.mako:200 +#: rhodecode/templates/changelog/changelog.mako:124 +#: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5211,6 +5402,7 @@ msgid "Author" msgstr "作者" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 @@ -5219,7 +5411,7 @@ msgid "Created on" msgstr "创建于" #: rhodecode/templates/admin/gists/index.mako:118 -#: rhodecode/templates/admin/gists/show.mako:65 +#: rhodecode/templates/admin/gists/show.mako:72 msgid "Expires" msgstr "" @@ -5253,44 +5445,33 @@ msgstr "" msgid "Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/gists/show.mako:47 +msgid "Copy the url" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:54 msgid "Confirm to delete this Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:56 -#: rhodecode/templates/admin/integrations/list.mako:204 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 -#: rhodecode/templates/base/issue_tracker_settings.mako:60 -#: rhodecode/templates/data_table/_dt_elements.mako:118 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#: rhodecode/templates/data_table/_dt_elements.mako:193 -#: rhodecode/templates/data_table/_dt_elements.mako:206 -#: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:208 -#: rhodecode/templates/files/files_edit.mako:165 -#: rhodecode/templates/files/files_source.mako:48 -#: rhodecode/templates/files/files_source.mako:51 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:339 -#: rhodecode/templates/users/user_profile.mako:7 -msgid "Edit" -msgstr "" - -#: rhodecode/templates/admin/gists/show.mako:58 +#: rhodecode/templates/admin/gists/show.mako:60 +msgid "Copy content" +msgstr "" + +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:62 +#: rhodecode/templates/admin/gists/show.mako:69 msgid "Private Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:77 +#: rhodecode/templates/admin/gists/show.mako:85 msgid "created" msgstr "" -#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/admin/gists/show.mako:100 #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 +#: rhodecode/templates/files/files_source.mako:100 msgid "Show as raw" msgstr "" @@ -5303,7 +5484,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:13 #: rhodecode/templates/admin/permissions/permissions_objects.mako:28 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 msgid "Repository Groups" msgstr "" @@ -5316,7 +5497,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 #: rhodecode/templates/base/base.mako:84 -#: rhodecode/templates/base/base.mako:251 +#: rhodecode/templates/base/base.mako:249 msgid "Settings" msgstr "设置" @@ -5338,67 +5519,67 @@ msgid "Current Integrations" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:64 -#: rhodecode/templates/admin/notifications/notifications.mako:31 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 msgid "All" msgstr "全部" -#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/list.mako:99 #: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:104 +#: rhodecode/templates/admin/integrations/list.mako:108 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:14 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/admin/integrations/list.mako:109 #: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:115 -msgid "No {type} integrations for repo {repo} exist yet." -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:117 -msgid "No {type} integrations for repogroup {repogroup} exist yet." -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:119 +msgid "No {type} integrations for repo {repo} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:121 +msgid "No {type} integrations for repogroup {repogroup} exist yet." +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:123 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:133 +#: rhodecode/templates/admin/integrations/list.mako:137 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:164 -msgid "repo" -msgstr "" - #: rhodecode/templates/admin/integrations/list.mako:168 -msgid "repogroup" -msgstr "" - -#: rhodecode/templates/admin/integrations/list.mako:170 -msgid "child repos only" +msgid "repo" msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 +msgid "repogroup" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:174 +msgid "child repos only" +msgstr "" + +#: rhodecode/templates/admin/integrations/list.mako:176 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:177 +#: rhodecode/templates/admin/integrations/list.mako:181 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:179 +#: rhodecode/templates/admin/integrations/list.mako:183 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.mako:185 +#: rhodecode/templates/admin/integrations/list.mako:189 msgid "unknown integration" msgstr "" @@ -5414,12 +5595,12 @@ msgstr "" msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.mako:61 +#: rhodecode/templates/admin/integrations/new.mako:63 msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:346 +#: rhodecode/templates/base/base.mako:355 msgid "My account" msgstr "我的账户" @@ -5438,26 +5619,35 @@ msgstr "" msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:35 +#: rhodecode/templates/admin/my_account/my_account.mako:32 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 +#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 +#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +msgid "SSH Keys" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:36 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:38 +#: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:39 +#: rhodecode/templates/admin/my_account/my_account.mako:40 msgid "Watched" msgstr "关注的" -#: rhodecode/templates/admin/my_account/my_account.mako:40 -#: rhodecode/templates/admin/notifications/notifications.mako:33 -#: rhodecode/templates/base/base.mako:241 +#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 +#: rhodecode/templates/base/base.mako:239 msgid "Pull Requests" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:42 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 #: rhodecode/templates/admin/repos/repo_edit.mako:49 @@ -5466,7 +5656,7 @@ msgstr "" msgid "Permissions" msgstr "权限" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:43 msgid "Live Notifications" msgstr "" @@ -5516,16 +5706,23 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 #: rhodecode/templates/admin/my_account/my_account_emails.mako:64 -#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 msgid "Add" msgstr "增加" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:128 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:125 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:118 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:116 +msgid "Select or enter expiration date" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:153 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:151 msgid "repository scope" msgstr "" @@ -5617,11 +5814,11 @@ msgstr "" msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -5630,7 +5827,7 @@ msgstr "" msgid "Title" msgstr "标题" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 #: rhodecode/templates/pullrequests/pullrequests.mako:118 msgid "Last Update" msgstr "" @@ -5639,41 +5836,97 @@ msgstr "" msgid "Repositories You Own" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +msgid "Fingerprint" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +msgid "" +"SSH Keys usage is currently disabled, please ask your administrator to " +"enable them." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +msgid "No additional ssh keys specified" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +msgid "New ssh key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +msgid "Generate random RSA key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +msgid "" +"Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-" +"sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.mako:5 -#: rhodecode/templates/admin/notifications/notifications.mako:12 +#: rhodecode/templates/admin/notifications/notifications_data.mako:5 +msgid "My notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:26 +msgid "Mark as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.mako:42 +msgid "No notifications here yet" +msgstr "无通知" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show.mako:14 +msgid "Show notification" +msgstr "显示通知" + +#: rhodecode/templates/admin/notifications/notifications_show.mako:12 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:5 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:12 msgid "My Notifications" msgstr "我的通知" -#: rhodecode/templates/admin/notifications/notifications.mako:32 -#: rhodecode/templates/changeset/changeset.mako:160 +#: rhodecode/templates/admin/notifications/notifications_show.mako:40 +msgid "Subject" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:26 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:30 +msgid "Mark all as read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "Unread" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 +#: rhodecode/templates/changeset/changeset.mako:163 msgid "Comments" msgstr "评论" -#: rhodecode/templates/admin/notifications/notifications.mako:37 -msgid "Mark all as read" -msgstr "" - -#: rhodecode/templates/admin/notifications/notifications_data.mako:39 -msgid "No notifications here yet" -msgstr "无通知" - -#: rhodecode/templates/admin/notifications/show_notification.mako:5 -#: rhodecode/templates/admin/notifications/show_notification.mako:14 -msgid "Show notification" -msgstr "显示通知" - -#: rhodecode/templates/admin/notifications/show_notification.mako:12 -msgid "Notifications" -msgstr "通知" - -#: rhodecode/templates/admin/notifications/show_notification.mako:40 -msgid "Subject" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" @@ -5691,6 +5944,10 @@ msgid "IP Whitelist" msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:45 +msgid "AuthToken Access" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.mako:51 msgid "Overview" msgstr "" @@ -5731,32 +5988,45 @@ msgstr "" msgid "External Authentication Account Activation" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5 +msgid "View whitelist" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36 +msgid "List of views available for usage in whitelist access" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:9 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +msgid "Current IP address" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ips.mako:30 #: rhodecode/templates/admin/users/user_edit_ips.mako:36 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:37 #: rhodecode/templates/admin/users/user_edit_ips.mako:44 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:52 #: rhodecode/templates/admin/users/user_edit_ips.mako:60 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:56 #: rhodecode/templates/admin/users/user_edit_ips.mako:63 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:57 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" @@ -5811,6 +6081,14 @@ msgstr "" msgid "Default User Permissions Overview" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7 +msgid "Update SSH keys file" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +msgid "Accessed on" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "" @@ -5827,16 +6105,21 @@ msgstr "" msgid "Group Name" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 +msgid "Plain text format with support of {metatags}" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 +#: rhodecode/templates/admin/repos/repo_add_base.mako:71 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:73 msgid "Copy permission settings from parent repository group." msgstr "" @@ -5852,7 +6135,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 #: rhodecode/templates/admin/repos/repo_edit.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/admin/users/user_edit.mako:40 +#: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" msgstr "" @@ -5881,18 +6164,6 @@ msgstr "" msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 -#, python-format -msgid "This repository group includes %s children repository group." -msgid_plural "This repository group includes %s children repository groups." -msgstr[0] "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 -#, python-format -msgid "This repository group includes %s repository." -msgid_plural "This repository group includes %s repositories." -msgstr[0] "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" @@ -5902,64 +6173,64 @@ msgstr "" msgid "Delete this repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "所有者" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 #: rhodecode/templates/base/issue_tracker_settings.mako:83 msgid "Add new" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." @@ -5970,19 +6241,23 @@ msgstr "" msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 -msgid "Change owner of this repository group." -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 msgid "Group parent" msgstr "上级组" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31 +msgid "Optional select a parent group to move this repository group into." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49 +msgid "Change owner of this repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " @@ -5997,7 +6272,7 @@ msgstr "" msgid "repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:61 msgid "Number of top level repositories" msgstr "" @@ -6014,51 +6289,51 @@ msgstr "" msgid "Clone from" msgstr "克隆自" -#: rhodecode/templates/admin/repos/repo_add_base.mako:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132 -#: rhodecode/templates/forks/fork.mako:52 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." -msgstr "保持简短。用README文件来写更长的描述。" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:134 +#: rhodecode/templates/forks/fork.mako:53 +msgid "" +"Plain text format with support of {metatags}. Add a README file for longer " +"descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:57 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:58 -#: rhodecode/templates/forks/fork.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:63 +#: rhodecode/templates/forks/fork.mako:69 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 -#: rhodecode/templates/forks/fork.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:66 +#: rhodecode/templates/forks/fork.mako:72 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:70 +#: rhodecode/templates/admin/repos/repo_add_base.mako:75 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:79 -msgid "Set the type of repository to create." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:84 +msgid "Set the type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 -#: rhodecode/templates/forks/fork.mako:73 +#: rhodecode/templates/forks/fork.mako:78 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:88 +#: rhodecode/templates/admin/repos/repo_add_base.mako:93 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 -#, python-format -msgid "%s Creating repository" +msgid "{} Creating repository" msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:12 @@ -6090,7 +6365,7 @@ msgid "Remote" msgstr "远程" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:135 +#: rhodecode/templates/summary/components.mako:143 msgid "Statistics" msgstr "统计" @@ -6199,7 +6474,7 @@ msgid "Delete forks" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:124 +#: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "确认删除版本库：%s" @@ -6224,6 +6499,15 @@ msgstr "" msgid "Pick repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:7 +msgid "Repository Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 +#: rhodecode/templates/admin/users/user_edit_audit.mako:14 +msgid "audit filter..." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6262,7 +6546,7 @@ msgstr "键" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/admin/user_groups/user_groups.mako:69 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 @@ -6450,8 +6734,8 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/data_table/_dt_elements.mako:164 -#: rhodecode/templates/forks/fork.mako:58 +#: rhodecode/templates/data_table/_dt_elements.mako:207 +#: rhodecode/templates/forks/fork.mako:63 msgid "Repository group" msgstr "版本库组" @@ -6469,9 +6753,9 @@ msgid "Remote uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:59 -#: rhodecode/templates/base/perms_summary.mako:79 -#: rhodecode/templates/base/perms_summary.mako:149 -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:210 +#: rhodecode/templates/base/perms_summary.mako:212 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "编辑" @@ -6506,32 +6790,32 @@ msgstr "" msgid "Change owner of this repository." msgstr "修改这个版本库的所有者" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138 -#: rhodecode/templates/data_table/_dt_elements.mako:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:144 +#: rhodecode/templates/data_table/_dt_elements.mako:92 msgid "Private repository" msgstr "私有版本库" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:154 msgid "Enable statistics" msgstr "启用统计" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:159 msgid "Enable statistics window on summary page." msgstr "启用概况页的统计窗口" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:164 msgid "Enable downloads" msgstr "启用下载" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:169 msgid "Enable download menu on summary page." msgstr "启用概况页的下载菜单" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:174 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -6626,7 +6910,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:139 #: rhodecode/templates/admin/settings/settings_labs.mako:48 #: rhodecode/templates/admin/settings/settings_vcs.mako:13 -#: rhodecode/templates/admin/settings/settings_visual.mako:221 +#: rhodecode/templates/admin/settings/settings_visual.mako:210 msgid "Save settings" msgstr "保存设置" @@ -6726,7 +7010,7 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:59 msgid "Personal Repository Group" msgstr "" @@ -6911,6 +7195,15 @@ msgstr "" msgid "Licenses of Third Party Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:3 +#: rhodecode/templates/admin/settings/settings_system.mako:3 +msgid "Checking for updates..." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:9 +msgid "Gunicorn process management" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -6968,10 +7261,6 @@ msgid "" "custom size" msgstr "" -#: rhodecode/templates/admin/settings/settings_system.mako:3 -msgid "Checking for updates..." -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7040,97 +7329,97 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:66 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." -msgstr "" - -#: rhodecode/templates/admin/settings/settings_visual.mako:88 +"Parses meta tags from repository or repository group description fields and " +"turns them into colored tags." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_visual.mako:77 msgid "Dashboard Items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:92 +#: rhodecode/templates/admin/settings/settings_visual.mako:81 msgid "Main page dashboard items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:98 +#: rhodecode/templates/admin/settings/settings_visual.mako:87 msgid "" "Number of items displayed in the main page dashboard before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:102 +#: rhodecode/templates/admin/settings/settings_visual.mako:91 msgid "Admin pages items" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:108 +#: rhodecode/templates/admin/settings/settings_visual.mako:97 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:117 +#: rhodecode/templates/admin/settings/settings_visual.mako:106 msgid "Commit ID Style" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:121 +#: rhodecode/templates/admin/settings/settings_visual.mako:110 msgid "Commit sha length" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:128 +#: rhodecode/templates/admin/settings/settings_visual.mako:117 msgid "" "Number of chars to show in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " length of the sha after the `r123:` part." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Show commit ID numeric reference" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:136 +#: rhodecode/templates/admin/settings/settings_visual.mako:125 msgid "Commit show revision number" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:138 +#: rhodecode/templates/admin/settings/settings_visual.mako:127 msgid "" "Show revision number in commit sha displayed in web interface.\n" " By default it's shown as r123:9043a6a4c226 this value defines the\n" " if the `r123:` part is shown." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:147 +#: rhodecode/templates/admin/settings/settings_visual.mako:136 #: rhodecode/templates/debug_style/index.html:63 msgid "Icons" msgstr "图标" -#: rhodecode/templates/admin/settings/settings_visual.mako:152 +#: rhodecode/templates/admin/settings/settings_visual.mako:141 msgid "Show public repo icon on repositories" msgstr "显示公共版本库图标" -#: rhodecode/templates/admin/settings/settings_visual.mako:158 +#: rhodecode/templates/admin/settings/settings_visual.mako:147 msgid "Show private repo icon on repositories" msgstr "显示私有版本库图标" -#: rhodecode/templates/admin/settings/settings_visual.mako:160 +#: rhodecode/templates/admin/settings/settings_visual.mako:149 msgid "Show public/private icons next to repositories names." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:167 +#: rhodecode/templates/admin/settings/settings_visual.mako:156 msgid "Markup Renderer" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:174 +#: rhodecode/templates/admin/settings/settings_visual.mako:163 msgid "" "Default renderer used to render comments, pull request descriptions and " "other description elements. After change old entries will still work " "correctly." msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:181 +#: rhodecode/templates/admin/settings/settings_visual.mako:170 msgid "Clone URL" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:190 +#: rhodecode/templates/admin/settings/settings_visual.mako:179 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" @@ -7140,11 +7429,11 @@ msgid "" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:203 +#: rhodecode/templates/admin/settings/settings_visual.mako:192 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:200 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7185,17 +7474,17 @@ msgid "%s user group settings" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 -#: rhodecode/templates/admin/users/user_edit.mako:41 +#: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Global permissions" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37 -#: rhodecode/templates/admin/users/user_edit.mako:42 +#: rhodecode/templates/admin/users/user_edit.mako:43 msgid "Permissions summary" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:60 +#: rhodecode/templates/admin/user_groups/user_groups.mako:65 #: rhodecode/templates/debug_style/form-elements.html:509 msgid "Members" msgstr "成员" @@ -7212,54 +7501,59 @@ msgstr "" msgid "Assigned to repo groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:19 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +msgid "Assigned to review rules" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:20 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 #, python-format msgid "User Group: %s" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:29 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:30 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:36 -msgid "This group is set to be automatically synchronised." -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37 +msgid "This group is set to be automatically synchronised." +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 msgid "This group synchronization was set by" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:59 msgid "" "Users will be added or removed from this group when they authenticate with " "RhodeCode system, based on LDAP group membership. This requires `LDAP+User " "group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:72 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:78 #, python-format msgid "" "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:80 msgid "Delete This User Group" msgstr "" @@ -7293,7 +7587,7 @@ msgstr "" msgid "user groups" msgstr "" -#: rhodecode/templates/admin/user_groups/user_groups.mako:62 +#: rhodecode/templates/admin/user_groups/user_groups.mako:67 msgid "Sync" msgstr "" @@ -7333,7 +7627,7 @@ msgid "Add personal repository group" msgstr "" #: rhodecode/templates/admin/users/user_add.mako:121 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" @@ -7364,16 +7658,12 @@ msgstr "" msgid "Auth tokens" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:44 +#: rhodecode/templates/admin/users/user_edit.mako:45 msgid "Ip Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit.mako:45 -msgid "User Groups Management" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.mako:46 -msgid "User audit" +msgid "User Groups Management" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 @@ -7387,104 +7677,91 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 #: rhodecode/templates/admin/users/users.mako:72 +#: rhodecode/templates/forks/forks.mako:77 msgid "Last activity" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:15 +msgid "Reviewer of pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:18 msgid "Member of User groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:16 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:19 msgid "Force password change" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:22 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:25 #, python-format msgid "User: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:31 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:34 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:39 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:42 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:41 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:44 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:47 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:50 msgid "" "When this is enabled user will have to change they password when they next " "use RhodeCode system. This will also forbid vcs operations until someone " "makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:62 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 msgid "Users personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:72 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:75 msgid "Create personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:81 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:84 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:89 -#, python-format -msgid "This user owns %s repository." -msgid_plural "This user owns %s repositories." -msgstr[0] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:93 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 msgid "Detach repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:98 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:114 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:130 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:101 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:117 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:133 msgid "Delete repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 -#, python-format -msgid "This user owns %s repository group." -msgid_plural "This user owns %s repository groups." -msgstr[0] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:109 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:112 msgid "Detach repository groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:121 -#, python-format -msgid "This user owns %s user group." -msgid_plural "This user owns %s user groups." -msgstr[0] "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:125 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 msgid "Detach user groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:139 -#: rhodecode/templates/data_table/_dt_elements.mako:199 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:259 #, python-format msgid "Confirm to delete this user: %s" msgstr "确认删除用户：%s" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:141 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:144 msgid "Delete this user" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:151 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:154 #, python-format msgid "" "When selecting the detach option, the depending objects owned by this user " @@ -7496,10 +7773,6 @@ msgstr "" msgid "User Audit Logs" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:14 -msgid "audit filter..." -msgstr "" - #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" @@ -7518,10 +7791,6 @@ msgstr "" msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 -msgid "Current IP address" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_ips.mako:10 msgid "IP Address" msgstr "" @@ -7578,9 +7847,32 @@ msgstr "" msgid "Help translate %(rc_link)s into your language." msgstr "" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +msgid "New SSH Key generated" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 +msgid "" +"Below is a 2048 bit generated SSH RSA key. You can use it to access " +"RhodeCode via the SSH wrapper." +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +msgid "Private key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +msgid "Public key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:34 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:36 +msgid "Add this generated key" +msgstr "" + #: rhodecode/templates/admin/users/users.mako:5 msgid "Users administration" -msgstr "用户管理员" +msgstr "用户管理" #: rhodecode/templates/admin/users/users.mako:78 msgid "Auth type" @@ -7619,141 +7911,141 @@ msgid "Repository not locked. Pull repos msgstr "" #: rhodecode/templates/base/base.mako:228 -#: rhodecode/templates/data_table/_dt_elements.mako:12 -#: rhodecode/templates/data_table/_dt_elements.mako:13 -#: rhodecode/templates/data_table/_dt_elements.mako:153 +#: rhodecode/templates/data_table/_dt_elements.mako:46 +#: rhodecode/templates/data_table/_dt_elements.mako:47 +#: rhodecode/templates/data_table/_dt_elements.mako:197 msgid "Summary" msgstr "概况" #: rhodecode/templates/base/base.mako:229 -#: rhodecode/templates/data_table/_dt_elements.mako:17 -#: rhodecode/templates/data_table/_dt_elements.mako:18 +#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:52 msgid "Changelog" msgstr "修订记录" #: rhodecode/templates/base/base.mako:230 -#: rhodecode/templates/data_table/_dt_elements.mako:22 -#: rhodecode/templates/data_table/_dt_elements.mako:23 +#: rhodecode/templates/data_table/_dt_elements.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:57 #: rhodecode/templates/files/files.mako:15 msgid "Files" msgstr "浏览" -#: rhodecode/templates/base/base.mako:232 +#: rhodecode/templates/base/base.mako:231 #: rhodecode/templates/bookmarks/bookmarks.mako:68 #: rhodecode/templates/branches/branches.mako:67 #: rhodecode/templates/tags/tags.mako:68 msgid "Compare" msgstr "比较显示" -#: rhodecode/templates/base/base.mako:237 +#: rhodecode/templates/base/base.mako:235 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:247 +#: rhodecode/templates/base/base.mako:245 msgid "Options" msgstr "选项" -#: rhodecode/templates/base/base.mako:255 -#: rhodecode/templates/forks/forks_data.mako:30 -msgid "Compare fork" -msgstr "比较复刻" - -#: rhodecode/templates/base/base.mako:258 -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/changelog/changelog.mako:40 +#, python-format +msgid "Compare fork with %s" +msgstr "" + +#: rhodecode/templates/base/base.mako:267 +#: rhodecode/templates/base/base.mako:411 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "搜索" -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/templates/base/base.mako:271 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:264 +#: rhodecode/templates/base/base.mako:273 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/data_table/_dt_elements.mako:27 -#: rhodecode/templates/data_table/_dt_elements.mako:28 -#: rhodecode/templates/forks/forks_data.mako:8 +#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/data_table/_dt_elements.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "复刻" -#: rhodecode/templates/base/base.mako:270 +#: rhodecode/templates/base/base.mako:279 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:292 +#: rhodecode/templates/base/base.mako:301 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:300 +#: rhodecode/templates/base/base.mako:309 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:317 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:327 +#: rhodecode/templates/base/base.mako:336 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:329 +#: rhodecode/templates/base/base.mako:338 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:348 +#: rhodecode/templates/base/base.mako:357 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:352 +#: rhodecode/templates/base/base.mako:361 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:388 +#: rhodecode/templates/base/base.mako:393 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:389 -#: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:14 -msgid "Journal" -msgstr "日志" - #: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/journal/journal.mako:4 +#: rhodecode/templates/journal/journal.mako:15 +msgid "Journal" +msgstr "日志" + +#: rhodecode/templates/base/base.mako:399 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:395 -msgid "Public journal" -msgstr "公共日志" - #: rhodecode/templates/base/base.mako:400 -msgid "Show Gists" -msgstr "" - -#: rhodecode/templates/base/base.mako:401 -msgid "Gists" -msgstr "" +msgid "Public journal" +msgstr "公共日志" #: rhodecode/templates/base/base.mako:405 +msgid "Show Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:406 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:410 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:411 +#: rhodecode/templates/base/base.mako:416 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:418 +#: rhodecode/templates/base/base.mako:423 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:428 -#: rhodecode/templates/base/base.mako:429 +#: rhodecode/templates/base/base.mako:433 +#: rhodecode/templates/base/base.mako:434 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7775,15 +8067,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:486 +#: rhodecode/templates/base/base.mako:491 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:539 +#: rhodecode/templates/base/base.mako:544 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:547 +#: rhodecode/templates/base/base.mako:552 msgid "Site-wide shortcuts" msgstr "" @@ -7893,9 +8185,9 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:274 #: rhodecode/templates/changeset/changeset_file_comment.mako:324 #: rhodecode/templates/files/files_add.mako:84 -#: rhodecode/templates/files/files_add.mako:228 -#: rhodecode/templates/files/files_edit.mako:82 -#: rhodecode/templates/files/files_edit.mako:185 +#: rhodecode/templates/files/files_add.mako:230 +#: rhodecode/templates/files/files_edit.mako:85 +#: rhodecode/templates/files/files_edit.mako:189 msgid "Preview" msgstr "" @@ -7903,77 +8195,94 @@ msgstr "" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:18 +#: rhodecode/templates/base/perms_summary.mako:14 +msgid "in JSON format" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:23 msgid "show" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:19 +#: rhodecode/templates/base/perms_summary.mako:24 msgid "none" msgstr "无" -#: rhodecode/templates/base/perms_summary.mako:20 +#: rhodecode/templates/base/perms_summary.mako:25 msgid "read" msgstr "读" -#: rhodecode/templates/base/perms_summary.mako:21 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "write" msgstr "写" -#: rhodecode/templates/base/perms_summary.mako:22 +#: rhodecode/templates/base/perms_summary.mako:27 msgid "admin" msgstr "管理" -#: rhodecode/templates/base/perms_summary.mako:29 +#: rhodecode/templates/base/perms_summary.mako:34 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 -#: rhodecode/templates/base/perms_summary.mako:103 +#: rhodecode/templates/base/perms_summary.mako:42 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Permission" msgstr "权限" -#: rhodecode/templates/base/perms_summary.mako:39 -#: rhodecode/templates/base/perms_summary.mako:105 +#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:152 msgid "Edit Permission" msgstr "编辑权限" -#: rhodecode/templates/base/perms_summary.mako:85 -msgid "Super admin" -msgstr "" - -#: rhodecode/templates/base/perms_summary.mako:87 +#: rhodecode/templates/base/perms_summary.mako:100 +#: rhodecode/templates/base/perms_summary.mako:109 +msgid "edit global" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:117 msgid "Repository default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:88 +#: rhodecode/templates/base/perms_summary.mako:120 msgid "Repository group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:89 +#: rhodecode/templates/base/perms_summary.mako:123 msgid "User group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:91 +#: rhodecode/templates/base/perms_summary.mako:126 +msgid "Super admin" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:129 +msgid "Inherit permissions" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:132 msgid "Create repositories" msgstr "创建版本库" -#: rhodecode/templates/base/perms_summary.mako:92 +#: rhodecode/templates/base/perms_summary.mako:135 msgid "Fork repositories" msgstr "复刻版本库" -#: rhodecode/templates/base/perms_summary.mako:93 +#: rhodecode/templates/base/perms_summary.mako:138 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:94 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Create user groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:162 +#: rhodecode/templates/base/perms_summary.mako:190 +msgid "overridden by" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:223 msgid "No permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:165 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8096,93 +8405,74 @@ msgstr "" msgid "Enable evolve extension for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "Mercurial Labs Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:152 -msgid "" -"These features are considered experimental and may not work as expected." +#: rhodecode/templates/base/vcs_settings.mako:153 +msgid "Git Settings" msgstr "" #: rhodecode/templates/base/vcs_settings.mako:158 -msgid "Use rebase as merge strategy" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:161 -msgid "" -"Use rebase instead of creating a merge commit when merging via web " -"interface." -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:173 -msgid "Git Settings" -msgstr "" - -#: rhodecode/templates/base/vcs_settings.mako:178 msgid "Enable lfs extension" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:182 +#: rhodecode/templates/base/vcs_settings.mako:162 msgid "Enable lfs extensions for all repositories." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:184 +#: rhodecode/templates/base/vcs_settings.mako:164 msgid "Enable lfs extensions for this repository." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:195 +#: rhodecode/templates/base/vcs_settings.mako:175 msgid "Filesystem location where Git lfs objects should be stored." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:206 +#: rhodecode/templates/base/vcs_settings.mako:186 msgid "Global Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:212 +#: rhodecode/templates/base/vcs_settings.mako:192 msgid "Proxy subversion HTTP requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:216 +#: rhodecode/templates/base/vcs_settings.mako:196 msgid "" "Subversion HTTP Support. Enables communication with SVN over HTTP protocol." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:217 +#: rhodecode/templates/base/vcs_settings.mako:197 msgid "SVN Protocol setup Documentation" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:223 +#: rhodecode/templates/base/vcs_settings.mako:203 msgid "Subversion HTTP Server URL" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:229 +#: rhodecode/templates/base/vcs_settings.mako:209 msgid "Generate Apache Config" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:241 +#: rhodecode/templates/base/vcs_settings.mako:221 msgid "Subversion Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:246 +#: rhodecode/templates/base/vcs_settings.mako:226 msgid "Repository patterns" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:250 +#: rhodecode/templates/base/vcs_settings.mako:230 msgid "" "Patterns for identifying SVN branches and tags. For recursive search, use " "\"*\". Eg.: \"/branches/*\"" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:314 +#: rhodecode/templates/base/vcs_settings.mako:294 msgid "Pull Request Settings" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:319 +#: rhodecode/templates/base/vcs_settings.mako:299 msgid "Enable server-side merge for pull requests" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:322 +#: rhodecode/templates/base/vcs_settings.mako:302 msgid "" "Note: when this feature is enabled, it only runs hooks defined in the " "rcextension package. Custom hooks added on the Admin -> Settings -> Hooks " @@ -8190,16 +8480,40 @@ msgid "" "web interface." msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:326 +#: rhodecode/templates/base/vcs_settings.mako:306 msgid "Invalidate and relocate inline comments during update" msgstr "" -#: rhodecode/templates/base/vcs_settings.mako:329 +#: rhodecode/templates/base/vcs_settings.mako:309 msgid "" "During the update of a pull request, the position of inline comments will be" " updated and outdated inline comments will be hidden." msgstr "" +#: rhodecode/templates/base/vcs_settings.mako:318 +msgid "Mercurial Pull Request Settings" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:324 +msgid "Use rebase as merge strategy" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:327 +msgid "" +"Use rebase instead of creating a merge commit when merging via web " +"interface." +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:332 +msgid "Close branch before merging it" +msgstr "" + +#: rhodecode/templates/base/vcs_settings.mako:335 +msgid "" +"Close branch before merging it into destination branch. No effect when " +"rebase strategy is use." +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.mako:5 #, python-format msgid "%s Bookmarks" @@ -8214,8 +8528,8 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:111 -#: rhodecode/templates/changeset/changeset.mako:112 +#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 #: rhodecode/templates/summary/summary_commits.mako:62 #, python-format @@ -8236,8 +8550,8 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:103 -#: rhodecode/templates/changeset/changeset.mako:125 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 #: rhodecode/templates/summary/summary_commits.mako:76 #, python-format @@ -8249,54 +8563,54 @@ msgstr "" msgid "%s Changelog" msgstr "%s修订记录" -#: rhodecode/templates/changelog/changelog.mako:40 -#: rhodecode/templates/forks/forks_data.mako:28 -#, python-format -msgid "Compare fork with %s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.mako:52 +#: rhodecode/templates/changelog/changelog.mako:50 #, python-format msgid "Compare fork with Parent (%s)" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:67 -#: rhodecode/templates/changelog/changelog.mako:68 +#: rhodecode/templates/changelog/changelog.mako:65 +#: rhodecode/templates/changelog/changelog.mako:66 msgid "Clear selection" msgstr "清除选择" -#: rhodecode/templates/changelog/changelog.mako:83 +#: rhodecode/templates/changelog/changelog.mako:81 msgid "Clear filter" msgstr "" #: rhodecode/templates/changelog/changelog.mako:89 -#, python-format -msgid "showing %d out of %d commit" -msgid_plural "showing %d out of %d commits" -msgstr[0] "" - -#: rhodecode/templates/changelog/changelog.mako:110 +msgid "Hide obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:91 +msgid "Show obsolete/hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:94 +msgid "Show hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog.mako:121 #: rhodecode/templates/files/files_add.mako:99 #: rhodecode/templates/files/files_delete.mako:60 -#: rhodecode/templates/files/files_edit.mako:96 +#: rhodecode/templates/files/files_edit.mako:99 msgid "Commit Message" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:112 +#: rhodecode/templates/changelog/changelog.mako:123 #: rhodecode/templates/summary/summary_commits.mako:10 msgid "Age" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:115 +#: rhodecode/templates/changelog/changelog.mako:126 #: rhodecode/templates/summary/summary_commits.mako:12 msgid "Refs" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:239 +#: rhodecode/templates/changelog/changelog.mako:250 msgid "Filter changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.mako:296 +#: rhodecode/templates/changelog/changelog.mako:311 msgid "There are no changes yet" msgstr "没有任何变更" @@ -8314,8 +8628,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:30 #: rhodecode/templates/summary/summary_commits.mako:25 -#, python-format -msgid "Commit status: %s" +msgid "Commit status: {}" msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:36 @@ -8328,43 +8641,48 @@ msgstr "" msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:53 -#: rhodecode/templates/changeset/changeset.mako:40 +#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changeset/changeset.mako:42 +msgid "Copy the full commit id" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:46 -#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changeset/changeset.mako:50 +#: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:60 -#: rhodecode/templates/changeset/changeset.mako:46 +#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:67 -#: rhodecode/templates/changeset/changeset.mako:53 -msgid "hidden" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:73 -#: rhodecode/templates/compare/compare_commits.mako:47 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:522 +#: rhodecode/templates/changeset/changeset.mako:57 +msgid "hidden" +msgstr "" + +#: rhodecode/templates/changelog/changelog_elements.mako:77 +#: rhodecode/templates/compare/compare_commits.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:97 -#: rhodecode/templates/changeset/changeset.mako:106 +#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "合并" -#: rhodecode/templates/changelog/changelog_elements.mako:119 -#: rhodecode/templates/changeset/changeset.mako:119 +#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 #: rhodecode/templates/summary/summary_commits.mako:69 #: rhodecode/templates/tags/tags_data.mako:12 @@ -8372,7 +8690,7 @@ msgstr "合并" msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:133 +#: rhodecode/templates/changelog/changelog_elements.mako:137 msgid "load next" msgstr "" @@ -8385,100 +8703,84 @@ msgstr "" msgid "%s Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:62 +#: rhodecode/templates/changeset/changeset.mako:65 msgid "Parent" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child Commit" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:66 +#: rhodecode/templates/changeset/changeset.mako:69 msgid "Child" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:78 +#: rhodecode/templates/changeset/changeset.mako:81 msgid "Expand" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:86 -#: rhodecode/templates/changeset/changeset.mako:92 +#: rhodecode/templates/changeset/changeset.mako:89 +#: rhodecode/templates/changeset/changeset.mako:95 #: rhodecode/templates/changeset/changeset_file_comment.mako:81 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:99 +#: rhodecode/templates/changeset/changeset.mako:102 #: rhodecode/templates/files/file_tree_detail.mako:21 #: rhodecode/templates/files/files_detail.mako:20 msgid "References" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:135 +#: rhodecode/templates/changeset/changeset.mako:138 msgid "Diff options" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:139 +#: rhodecode/templates/changeset/changeset.mako:142 #: rhodecode/templates/codeblocks/diffs.mako:445 #: rhodecode/templates/codeblocks/diffs.mako:448 msgid "Raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:140 +#: rhodecode/templates/changeset/changeset.mako:143 msgid "Raw Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:143 +#: rhodecode/templates/changeset/changeset.mako:146 msgid "Patch diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:144 -msgid "Patch Diff" -msgstr "" - #: rhodecode/templates/changeset/changeset.mako:147 +msgid "Patch Diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.mako:150 #: rhodecode/templates/codeblocks/diffs.mako:452 #: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:148 +#: rhodecode/templates/changeset/changeset.mako:151 msgid "Download Diff" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:165 -#: rhodecode/templates/changeset/changeset.mako:167 -#: rhodecode/tests/functional/test_commit_comments.py:275 -#, python-format -msgid "%d Commit comment" -msgid_plural "%d Commit comments" -msgstr[0] "" - -#: rhodecode/templates/changeset/changeset.mako:170 -#: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/tests/functional/test_commit_comments.py:282 -#, python-format -msgid "%d Inline Comment" -msgid_plural "%d Inline Comments" -msgstr[0] "" - -#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/changeset/changeset.mako:183 msgid "Unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:189 +#: rhodecode/templates/changeset/changeset.mako:192 msgid "There are no unresolved TODOs" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:269 +#: rhodecode/templates/changeset/changeset.mako:272 msgid "No Child Commits" msgstr "" -#: rhodecode/templates/changeset/changeset.mako:305 +#: rhodecode/templates/changeset/changeset.mako:308 msgid "No Parent Commits" msgstr "" @@ -8548,12 +8850,12 @@ msgid "Leave a comment on this Commit." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:71 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "现在登陆" @@ -8573,7 +8875,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:368 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "已关闭" @@ -8591,14 +8893,8 @@ msgstr "评论" msgid "%s Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:9 -#: rhodecode/templates/changeset/changeset_range.mako:20 -#, python-format -msgid "(%s commit)" -msgid_plural "(%s commits)" -msgstr[0] "" - #: rhodecode/templates/changeset/changeset_range.mako:16 +#: rhodecode/templates/files/file_authors_box.mako:33 msgid "Commits" msgstr "" @@ -8610,29 +8906,13 @@ msgstr "" msgid "Diff option" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:59 +#: rhodecode/templates/changeset/changeset_range.mako:65 msgid "Show combined compare" msgstr "" -#: rhodecode/templates/changeset/changeset_range.mako:99 -#: rhodecode/templates/compare/compare_diff.mako:312 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:446 -#, python-format -msgid "Expand %s commit" -msgid_plural "Expand %s commits" -msgstr[0] "" - -#: rhodecode/templates/changeset/changeset_range.mako:105 -#: rhodecode/templates/compare/compare_diff.mako:318 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 -#, python-format -msgid "Collapse %s commit" -msgid_plural "Collapse %s commits" -msgstr[0] "" - #: rhodecode/templates/changeset/diff_block.mako:7 -#: rhodecode/templates/codeblocks/diffs.mako:128 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:123 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "The requested commit is too big and content was truncated." msgstr "" @@ -8640,8 +8920,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -8649,8 +8929,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:131 -#: rhodecode/templates/codeblocks/diffs.mako:182 +#: rhodecode/templates/codeblocks/diffs.mako:126 +#: rhodecode/templates/codeblocks/diffs.mako:177 msgid "Show full diff" msgstr "" @@ -8663,65 +8943,50 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/changeset/diff_block.mako:58 -#, python-format -msgid "%(num)s file changed" -msgid_plural "%(num)s files changed" -msgstr[0] "" - -#: rhodecode/templates/changeset/diff_block.mako:60 -#: rhodecode/templates/codeblocks/diffs.mako:133 -#, python-format -msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgid_plural "" -"%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted" -msgstr[0] "" - -#: rhodecode/templates/codeblocks/diffs.mako:117 +#: rhodecode/templates/codeblocks/diffs.mako:111 msgid "Browse Files at revision {}" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:118 +#: rhodecode/templates/codeblocks/diffs.mako:112 msgid "Browse Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:130 -#, python-format -msgid "%(num)s file changed." -msgid_plural "%(num)s files changed." -msgstr[0] "" - -#: rhodecode/templates/codeblocks/diffs.mako:141 +#: rhodecode/templates/codeblocks/diffs.mako:136 msgid "No files" msgstr "无文件" -#: rhodecode/templates/codeblocks/diffs.mako:169 +#: rhodecode/templates/codeblocks/diffs.mako:164 msgid "File was deleted" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:171 +#: rhodecode/templates/codeblocks/diffs.mako:166 msgid "Binary file hidden" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:184 +#, python-format +msgid "" +"This diff has been collapsed as it changes many lines, (%i lines changed)" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:186 +msgid "Show them" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:189 -#, python-format -msgid "" -"This diff has been collapsed as it changes many lines, (%i lines changed)" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:191 -msgid "Show them" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:289 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" +#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/files/files_source.mako:19 +msgid "Copy the full path" +msgstr "" + #: rhodecode/templates/codeblocks/diffs.mako:415 #: rhodecode/templates/codeblocks/diffs.mako:431 #, python-format @@ -8780,7 +9045,7 @@ msgstr "" msgid "Wide Mode Diff" msgstr "" -#: rhodecode/templates/codeblocks/source.mako:24 +#: rhodecode/templates/codeblocks/source.mako:25 msgid "view annotation from before this change" msgstr "" @@ -8793,23 +9058,11 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:483 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:68 -#, python-format -msgid "%s commit hidden" -msgid_plural "%s commits hidden" -msgstr[0] "" - -#: rhodecode/templates/compare/compare_commits.mako:69 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 -msgid "show it" -msgid_plural "show them" -msgstr[0] "" - -#: rhodecode/templates/compare/compare_commits.mako:75 +#: rhodecode/templates/compare/compare_commits.mako:73 msgid "No commits in this compare" msgstr "" @@ -8819,12 +9072,6 @@ msgstr "" msgid "%s Compare" msgstr "" -#: rhodecode/templates/compare/compare_diff.mako:17 -#, python-format -msgid "%s commit" -msgid_plural "%s commits" -msgstr[0] "" - #: rhodecode/templates/compare/compare_diff.mako:44 #: rhodecode/templates/compare/compare_diff.mako:101 #: rhodecode/templates/compare/compare_diff.mako:110 @@ -8838,14 +9085,14 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:103 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:76 #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 -#: rhodecode/templates/files/files_source.mako:23 +#: rhodecode/templates/files/files_source.mako:29 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 msgid "Source" msgstr "" @@ -8869,71 +9116,69 @@ msgstr "" msgid "Compare commits, branches, bookmarks or tags." msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:49 +#: rhodecode/templates/data_table/_dt_elements.mako:83 msgid "Mercurial repository" msgstr "Mercurial版本库" -#: rhodecode/templates/data_table/_dt_elements.mako:51 +#: rhodecode/templates/data_table/_dt_elements.mako:85 msgid "Git repository" msgstr "Git版本库" -#: rhodecode/templates/data_table/_dt_elements.mako:53 +#: rhodecode/templates/data_table/_dt_elements.mako:87 msgid "Subversion repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:60 +#: rhodecode/templates/data_table/_dt_elements.mako:94 msgid "Public repository" msgstr "公共版本库" -#: rhodecode/templates/data_table/_dt_elements.mako:70 -msgid "Repository creating in progress..." -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:88 +#: rhodecode/templates/data_table/_dt_elements.mako:104 +msgid "This repository is being created in a background task" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:105 +msgid "creating..." +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:136 msgid "No commits yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:95 -#: rhodecode/templates/data_table/_dt_elements.mako:97 +#: rhodecode/templates/data_table/_dt_elements.mako:143 +#: rhodecode/templates/data_table/_dt_elements.mako:145 #, python-format msgid "Subscribe to %s rss feed" msgstr "订阅%s的RSS" -#: rhodecode/templates/data_table/_dt_elements.mako:103 -#: rhodecode/templates/data_table/_dt_elements.mako:105 +#: rhodecode/templates/data_table/_dt_elements.mako:151 +#: rhodecode/templates/data_table/_dt_elements.mako:153 #, python-format msgid "Subscribe to %s atom feed" msgstr "订阅%s的Atom" -#: rhodecode/templates/data_table/_dt_elements.mako:133 +#: rhodecode/templates/data_table/_dt_elements.mako:181 msgid "Creating" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:135 -msgid "Created" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:185 -#, 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] "确认删除这个版本库组：%s包含%s个版本库" - -#: rhodecode/templates/data_table/_dt_elements.mako:211 +#: rhodecode/templates/data_table/_dt_elements.mako:225 +msgid "personal" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:271 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:228 +#: rhodecode/templates/data_table/_dt_elements.mako:288 msgid "User group" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:272 -#: rhodecode/templates/forks/fork.mako:83 +#: rhodecode/templates/data_table/_dt_elements.mako:332 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "私有" -#: rhodecode/templates/data_table/_dt_elements.mako:306 +#: rhodecode/templates/data_table/_dt_elements.mako:366 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" @@ -9235,12 +9480,6 @@ msgstr "" msgid "Link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:46 -#, python-format -msgid "Commit (%(num)s)" -msgid_plural "Commits (%(num)s)" -msgstr[0] "" - #: rhodecode/templates/email_templates/pull_request_review.mako:71 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"." @@ -9256,12 +9495,6 @@ msgstr "" msgid "%(target_ref_type)s of %(target_repo_url)s" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:76 -#, python-format -msgid "%(num)s Commit" -msgid_plural "%(num)s Commits" -msgstr[0] "" - #: rhodecode/templates/email_templates/test.mako:5 msgid "hello \"world\"" msgstr "" @@ -9297,12 +9530,6 @@ msgstr "" msgid "Last Author" msgstr "" -#: rhodecode/templates/files/file_authors_box.mako:8 -#, python-format -msgid "File Author (%s)" -msgid_plural "File Authors (%s)" -msgstr[0] "" - #: rhodecode/templates/files/file_authors_box.mako:11 msgid "Show All" msgstr "" @@ -9370,22 +9597,22 @@ msgid "Create New File" msgstr "" #: rhodecode/templates/files/files_add.mako:81 -#: rhodecode/templates/files/files_edit.mako:79 +#: rhodecode/templates/files/files_edit.mako:82 msgid "line wraps" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "on" msgstr "" #: rhodecode/templates/files/files_add.mako:82 -#: rhodecode/templates/files/files_edit.mako:80 +#: rhodecode/templates/files/files_edit.mako:83 msgid "off" msgstr "" #: rhodecode/templates/files/files_add.mako:109 -#: rhodecode/templates/files/files_edit.mako:106 +#: rhodecode/templates/files/files_edit.mako:109 msgid "Commit changes" msgstr "提交修改" @@ -9440,15 +9667,15 @@ msgid "Delete file" msgstr "" #: rhodecode/templates/files/files_delete.mako:45 -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:71 #, python-format msgid "Binary file (%s)" msgstr "二进制文件（%s）" #: rhodecode/templates/files/files_delete.mako:50 -#: rhodecode/templates/files/files_source.mako:87 -msgid "File is too big to display" -msgstr "文件过大，不能显示" +#: rhodecode/templates/files/files_source.mako:100 +msgid "File size {} is bigger then allowed limit {}. " +msgstr "" #: rhodecode/templates/files/files_delete.mako:70 msgid "Delete File" @@ -9497,15 +9724,15 @@ msgstr "" msgid "annotation" msgstr "显示注释" -#: rhodecode/templates/files/files_edit.mako:65 +#: rhodecode/templates/files/files_edit.mako:67 msgid "raw" msgstr "" -#: rhodecode/templates/files/files_edit.mako:67 +#: rhodecode/templates/files/files_edit.mako:70 msgid "download" msgstr "" -#: rhodecode/templates/files/files_edit.mako:74 +#: rhodecode/templates/files/files_edit.mako:77 msgid "Editing file" msgstr "编辑文件" @@ -9513,61 +9740,55 @@ msgstr "编辑文件" msgid "Location" msgstr "位置" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:8 +#: rhodecode/templates/files/files_source.mako:13 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:10 -msgid "line" -msgid_plural "lines" -msgstr[0] "" - -#: rhodecode/templates/files/files_source.mako:17 +#: rhodecode/templates/files/files_source.mako:23 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:20 -#: rhodecode/templates/search/search_content.mako:68 +#: rhodecode/templates/files/files_source.mako:26 +#: rhodecode/templates/search/search_content.mako:69 msgid "Show Full History" msgstr "" -#: rhodecode/templates/files/files_source.mako:25 -#: rhodecode/templates/search/search_content.mako:70 -msgid "Annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:27 -#: rhodecode/templates/search/search_content.mako:71 -msgid "Raw" -msgstr "" - #: rhodecode/templates/files/files_source.mako:31 +#: rhodecode/templates/search/search_content.mako:71 +msgid "Annotation" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:33 +#: rhodecode/templates/search/search_content.mako:72 +msgid "Raw" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:37 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:41 #: rhodecode/templates/search/search_content.mako:73 msgid "Download" msgstr "下载" -#: rhodecode/templates/files/files_source.mako:43 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: rhodecode/templates/files/files_source.mako:48 +#: rhodecode/templates/files/files_source.mako:49 +msgid "Edit on Branch:{}" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:54 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:51 +#: rhodecode/templates/files/files_source.mako:57 msgid "Editing files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:52 +#: rhodecode/templates/files/files_source.mako:58 msgid "Deleting files allowed only when on branch head commit" msgstr "" @@ -9581,22 +9802,23 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 +#: rhodecode/templates/forks/forks.mako:70 msgid "Fork name" msgstr "复刻名称" -#: rhodecode/templates/forks/fork.mako:77 +#: rhodecode/templates/forks/fork.mako:82 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:93 +#: rhodecode/templates/forks/fork.mako:98 msgid "Copy permissions" msgstr "拷贝权限" -#: rhodecode/templates/forks/fork.mako:97 +#: rhodecode/templates/forks/fork.mako:102 msgid "Copy permissions from forked repository" msgstr "从被复刻版本库拷贝权限" -#: rhodecode/templates/forks/fork.mako:102 +#: rhodecode/templates/forks/fork.mako:107 msgid "Fork this Repository" msgstr "" @@ -9609,33 +9831,23 @@ msgstr "%s个复刻" msgid "Forks" msgstr "复刻" -#: rhodecode/templates/forks/forks.mako:32 +#: rhodecode/templates/forks/forks.mako:30 msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:10 +#: rhodecode/templates/forks/forks.mako:74 msgid "Forked" msgstr "" -#: rhodecode/templates/forks/forks_data.mako:46 -msgid "There are no forks yet" -msgstr "无复刻" - -#: rhodecode/templates/journal/journal.mako:13 -msgid "Filter" -msgstr "" - #: rhodecode/templates/journal/journal.mako:14 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" -msgstr[0] "%s条" - -#: rhodecode/templates/journal/journal.mako:23 +msgid "Filter" +msgstr "" + +#: rhodecode/templates/journal/journal.mako:24 msgid "ATOM journal feed" msgstr "订阅日志ATOM" -#: rhodecode/templates/journal/journal.mako:24 +#: rhodecode/templates/journal/journal.mako:25 msgid "RSS journal feed" msgstr "订阅日志RSS" @@ -9644,15 +9856,15 @@ msgid "No entries yet" msgstr "没有条目" #: rhodecode/templates/journal/public_journal.mako:4 -#: rhodecode/templates/journal/public_journal.mako:24 +#: rhodecode/templates/journal/public_journal.mako:12 msgid "Public Journal" msgstr "公共日志" -#: rhodecode/templates/journal/public_journal.mako:16 +#: rhodecode/templates/journal/public_journal.mako:21 msgid "ATOM public journal feed" msgstr "订阅公共日志ATOM" -#: rhodecode/templates/journal/public_journal.mako:17 +#: rhodecode/templates/journal/public_journal.mako:22 msgid "RSS public journal feed" msgstr "订阅公共日志RSS" @@ -9682,22 +9894,22 @@ msgid "Submit Pull Request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:309 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 msgid "Author of this pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:323 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 msgid "Reviewer rules" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:337 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 msgid "Pull request reviewers" msgstr "拉取请求检视人员" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:392 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 msgid "Add reviewer or reviewer group" msgstr "" @@ -9710,12 +9922,6 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:356 -#: rhodecode/templates/pullrequests/pullrequest.mako:358 -msgid "This pull request will consist of __COMMITS__ commit." -msgid_plural "This pull request will consist of __COMMITS__ commits." -msgstr[0] "" - #: rhodecode/templates/pullrequests/pullrequest.mako:361 msgid "Show detailed compare." msgstr "" @@ -9740,26 +9946,26 @@ msgstr "" msgid "Merge is not currently possible because of below failed checks." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:37 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:52 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57 msgid "refresh checks" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:38 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "Merge Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:43 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 msgid "You are not allowed to merge this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:45 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60 msgid "Login to Merge this Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:58 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:69 +#: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:73 msgid "Close with status {}" msgstr "" @@ -9780,169 +9986,175 @@ msgstr "确认删除拉取请求" msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:125 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +msgid "Copy the pull url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:138 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/summary/components.mako:53 +#: rhodecode/templates/summary/components.mako:69 +msgid "Copy the clone url" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:146 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:157 -#, python-format -msgid "calculated based on %s reviewer vote" -msgid_plural "calculated based on %s reviewers votes" -msgstr[0] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:175 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:186 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:188 -msgid "{} version available for this pull request, show it." -msgid_plural "{} versions available for this pull request, show them." -msgstr[0] "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:187 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:212 -msgid "Your review status at this version" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +msgid "Your review status at this version" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 msgid "Comment from pull request version {0}, general:{1} inline:{2}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:235 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:239 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "select versions to show changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:236 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 msgid "show changes between versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:237 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:243 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:252 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:256 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:261 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:263 -#, python-format -msgid "%d General " -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 #, python-format -msgid "%d Inline" +msgid "%d General " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:273 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#, python-format +msgid "%d Inline" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 #, python-format msgid "%d Outdated" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:274 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 msgid "show outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:281 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:286 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:300 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:414 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 +msgid "Mandatory reviewer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:415 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "" "These commits cannot be displayed, because this repository uses the " "Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:423 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:429 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:424 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 msgid "" "This pull request cannot be displayed, because one or more commits no longer" " exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:425 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:431 msgid "" "Please update this pull request, push the commits back into the source " "repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:436 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:442 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:461 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:472 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 msgid "" "Commits and changes between v{ver_from} and {ver_to} of this pull request, " "commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:476 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:494 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:496 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:599 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:602 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:603 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 msgid "show them" msgstr "" @@ -10045,7 +10257,7 @@ msgstr "" msgid "Age (old first)" msgstr "" -#: rhodecode/templates/search/search_content.mako:33 +#: rhodecode/templates/search/search_content.mako:34 msgid "more matches in this file" msgstr "" @@ -10053,84 +10265,74 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/base.mako:5 -#, python-format -msgid "%s Summary" -msgstr "%s概要" - -#: rhodecode/templates/summary/base.mako:13 -#, python-format -msgid "%s ATOM feed" -msgstr "" - -#: rhodecode/templates/summary/base.mako:14 -#, python-format -msgid "%s RSS feed" -msgstr "" - #: rhodecode/templates/summary/components.mako:49 msgid "Read-only url" msgstr "" -#: rhodecode/templates/summary/components.mako:54 -#: rhodecode/templates/summary/components.mako:65 -msgid "Show by Name" -msgstr "以名字显示" - -#: rhodecode/templates/summary/components.mako:55 -#: rhodecode/templates/summary/components.mako:66 -msgid "Show by ID" -msgstr "按ID显示" - -#: rhodecode/templates/summary/components.mako:56 -msgid "SVN Protocol is disabled. To enable it, see the" -msgstr "" - #: rhodecode/templates/summary/components.mako:56 +#: rhodecode/templates/summary/components.mako:72 +msgid "Copy the clone by id url" +msgstr "" + +#: rhodecode/templates/summary/components.mako:58 +#: rhodecode/templates/summary/components.mako:74 +msgid "Show by Name" +msgstr "以名字显示" + +#: rhodecode/templates/summary/components.mako:59 +#: rhodecode/templates/summary/components.mako:75 +msgid "Show by ID" +msgstr "按ID显示" + +#: rhodecode/templates/summary/components.mako:61 +msgid "SVN Protocol is disabled. To enable it, see the" +msgstr "" + +#: rhodecode/templates/summary/components.mako:61 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:60 +#: rhodecode/templates/summary/components.mako:65 msgid "Clone url" msgstr "克隆地址" -#: rhodecode/templates/summary/components.mako:86 +#: rhodecode/templates/summary/components.mako:94 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:102 -msgid "Number of Repository Forks" -msgstr "" - #: rhodecode/templates/summary/components.mako:110 +msgid "Number of Repository Forks" +msgstr "" + +#: rhodecode/templates/summary/components.mako:118 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:141 +#: rhodecode/templates/summary/components.mako:149 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:145 +#: rhodecode/templates/summary/components.mako:153 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" -#: rhodecode/templates/summary/components.mako:148 +#: rhodecode/templates/summary/components.mako:156 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:159 +#: rhodecode/templates/summary/components.mako:167 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:165 +#: rhodecode/templates/summary/components.mako:173 msgid "There are no downloads yet" msgstr "无下载" -#: rhodecode/templates/summary/components.mako:169 +#: rhodecode/templates/summary/components.mako:177 msgid "Downloads are disabled for this repository" msgstr "这个版本库的下载已经禁用" -#: rhodecode/templates/summary/components.mako:172 +#: rhodecode/templates/summary/components.mako:180 msgid "enable downloads" msgstr "" @@ -10148,6 +10350,21 @@ msgstr "快速入门" msgid "Readme file from commit %s:%s" msgstr "" +#: rhodecode/templates/summary/summary_base.mako:5 +#, python-format +msgid "%s Summary" +msgstr "%s概要" + +#: rhodecode/templates/summary/summary_base.mako:13 +#, python-format +msgid "%s ATOM feed" +msgstr "" + +#: rhodecode/templates/summary/summary_base.mako:14 +#, python-format +msgid "%s RSS feed" +msgstr "" + #: rhodecode/templates/summary/summary_commits.mako:100 msgid "Add or upload files directly via RhodeCode:" msgstr ""