diff --git a/docs/install/configure-celery.rst b/docs/install/configure-celery.rst index a3c8bd15..b26eda00 100644 --- a/docs/install/configure-celery.rst +++ b/docs/install/configure-celery.rst @@ -4,27 +4,48 @@ Configure Celery ---------------- -To improve |RCM| performance you should configure and enabled Celery_ as it makes -asynchronous tasks work efficiently. Most important it allows sending notification -emails, create repository forks, and import repositories in async way. +Celery_ is an asynchronous task queue. It's a part of RhodeCode scheduler +functionality. Celery_ makes certain heavy tasks perform more efficiently. +Most important it allows sending notification emails, create repository forks, +and import repositories in async way. It is also used for bi-directional +repository sync in scheduler. If you decide to use Celery you also need a working message queue. -The recommended message broker is rabbitmq_. +The recommended and fully supported message broker is rabbitmq_. -In order to have install and configure Celery, follow these steps: +In order to install and configure Celery, follow these steps: 1. Install RabbitMQ, see the documentation on the Celery website for - `rabbitmq installation`_. + `rabbitmq installation`_, or `rabbitmq website installation`_ -2. Configure Celery in the + +1a. As en example configuration after installation, you can run:: + + sudo rabbitmqctl add_user rcuser secret_password + sudo rabbitmqctl add_vhost rhodevhost + sudo rabbitmqctl set_user_tags rcuser rhodecode + sudo rabbitmqctl set_permissions -p rhodevhost rcuser ".*" ".*" ".*" + + +2. Enable celery, and install `celery worker` process script using the `enable-module`:: + + rccontrol enable-module celery {instance-id} + +.. note:: + + In case when using multiple instances in one or multiple servers it's highly + recommended that celery is running only once, for all servers connected to + the same database. Having multiple celery instances running without special + reconfiguration could cause scheduler issues. + + +3. Configure Celery in the :file:`home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. - Set the following minimal settings, that are set during rabbitmq_ installation:: + Set the broker_url as minimal settings required to enable operation. + If used our example data from pt 1a, here is how the broker url should look like:: - broker.host = - broker.vhost = - broker.user = - broker.password = + celery.broker_url = amqp://rcuser:secret_password@localhost:5672/rhodevhost Full configuration example is below: @@ -34,35 +55,15 @@ In order to have install and configure Celery, follow these steps: #################################### ### CELERY CONFIG #### #################################### - ## Set to true + use_celery = true - broker.host = localhost - broker.vhost = rabbitmqvhost - broker.port = 5672 - broker.user = rabbitmq - broker.password = secret + celery.broker_url = amqp://rcuser:secret@localhost:5672/rhodevhost - celery.imports = rhodecode.lib.celerylib.tasks - - celery.result.backend = amqp - celery.result.dburi = amqp:// - celery.result.serialier = json - - #celery.send.task.error.emails = true - #celery.amqp.task.result.expires = 18000 - - celeryd.concurrency = 2 - #celeryd.log.file = celeryd.log - celeryd.log.level = debug - celeryd.max.tasks.per.child = 1 + # maximum tasks to execute before worker restart + celery.max_tasks_per_child = 100 ## tasks will never be sent to the queue, but executed locally instead. - celery.always.eager = false - - -3. Enable celery, and install `celeryd` process script using the `enable-module`:: - - rccontrol enable-module celery {instance-id} + celery.task_always_eager = false .. _python: http://www.python.org/ @@ -70,4 +71,5 @@ In order to have install and configure Celery, follow these steps: .. _celery: http://celeryproject.org/ .. _rabbitmq: http://www.rabbitmq.com/ .. _rabbitmq installation: http://docs.celeryproject.org/en/latest/getting-started/brokers/rabbitmq.html +.. _rabbitmq website installation: http://www.rabbitmq.com/download.html .. _Celery installation: http://docs.celeryproject.org/en/latest/getting-started/introduction.html#bundles diff --git a/docs/release-notes/release-notes-4.11.1.rst b/docs/release-notes/release-notes-4.11.1.rst new file mode 100644 index 00000000..63a9a46a --- /dev/null +++ b/docs/release-notes/release-notes-4.11.1.rst @@ -0,0 +1,54 @@ +|RCE| 4.11.1 |RNS| +------------------ + +Release Date +^^^^^^^^^^^^ + +- 2018-02-02 + + +New Features +^^^^^^^^^^^^ + + + +General +^^^^^^^ + + + +Security +^^^^^^^^ + + + +Performance +^^^^^^^^^^^ + + + +Fixes +^^^^^ + + +- Audit logs: handle query syntax errors in whoosh query parser. Prevents 500 + errors on wrongly entered search terms in audit logs. + +- Mercurial: fix new 4.4.X code change that does strict requirement checks. Fixes + problems with Mercurial Largefiles repositories. + +- VCSServer: in case of errors in the VCSServer worker restart it gracefully. + In rare cases certain errors caused locking of workers, and + unresponsive connections. Now we restart a worker freeing up memory and + connection. + +- Git: handle flaky and slow connection issues with git. Due to the changes in + Pyramid, flaky connections started affecting git clones. + + +Upgrade notes +^^^^^^^^^^^^^ + +- Fixed regression on git with high latency connections. + No upgrade problems should be expected, however please check GIT repos + behaviour on upgrade. diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst index fc956659..7e375495 100644 --- a/docs/release-notes/release-notes.rst +++ b/docs/release-notes/release-notes.rst @@ -9,6 +9,7 @@ Release Notes .. toctree:: :maxdepth: 1 + release-notes-4.11.1.rst release-notes-4.11.0.rst release-notes-4.10.6.rst release-notes-4.10.5.rst diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix index 3bb06a97..51ecb56b 100644 --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1680,7 +1680,7 @@ }; }; rhodecode-enterprise-ce = super.buildPythonPackage { - name = "rhodecode-enterprise-ce-4.11.0"; + name = "rhodecode-enterprise-ce-4.11.1"; buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj]; doCheck = true; propagatedBuildInputs = with self; [setuptools-scm amqp authomatic Babel Beaker celery Chameleon channelstream click colander configobj cssselect decorator deform docutils dogpile.cache dogpile.core ecdsa FormEncode future futures gnureadline infrae.cache iso8601 itsdangerous Jinja2 billiard kombu lxml Mako Markdown MarkupSafe msgpack-python MySQL-python objgraph packaging Paste PasteDeploy PasteScript pathlib2 peppercorn psutil psycopg2 py-bcrypt pycrypto pycurl pyflakes pygments-markdown-lexer Pygments pyparsing pyramid-beaker pyramid-debugtoolbar pyramid-jinja2 pyramid-mako pyramid pysqlite python-dateutil python-ldap python-memcached python-pam pytz pyzmq py-gfm recaptcha-client redis repoze.lru requests Routes setproctitle simplejson six SQLAlchemy sshpubkeys subprocess32 supervisor Tempita translationstring trollius urllib3 URLObject venusian WebError WebHelpers2 WebHelpers WebOb Whoosh wsgiref zope.cachedescriptors zope.deprecation zope.event zope.interface nbconvert bleach nbformat jupyter-client alembic invoke bumpversion transifex-client gevent greenlet gunicorn waitress uWSGI ipdb ipython CProfileV bottle rhodecode-tools appenlight-client pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage]; diff --git a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo index 59ecb1ac..40ea5704 100644 Binary files a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo and b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo differ diff --git a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po index 8526d341..2b7706e2 100644 --- a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po @@ -1,5 +1,5 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2017 RhodeCode GmbH +# Copyright (C) 2018 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-11-03 16:42+0100\n" -"PO-Revision-Date: 2017-11-03 15:43+0000\n" +"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"PO-Revision-Date: 2018-01-30 16:33+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: German (http://www.transifex.com/rhodecode/RhodeCode/language/de/)\n" "MIME-Version: 1.0\n" @@ -21,32 +21,53 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/apps/_base/__init__.py:142 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "Fehler beim Erstellen des Repositorys %s: Ungültiges Zertifikat" + +#: rhodecode/apps/_base/__init__.py:146 +#, python-format +msgid "Error creating repository %s" +msgstr "Fehler beim Erstellen des Repositorys %s" + +#: rhodecode/apps/_base/__init__.py:219 +#, python-format +msgid "" +"The repository `%(repo_name)s` cannot be loaded in filesystem. Please check " +"if it exist, or is not damaged." +msgstr "" + +#: rhodecode/apps/_base/__init__.py:274 +msgid "Editing user `{}` is disabled." +msgstr "" + +#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/apps/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:74 #: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "" -#: rhodecode/apps/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:76 msgid "Visual" msgstr "" -#: rhodecode/apps/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:78 msgid "Remap and Rescan" msgstr "" -#: rhodecode/apps/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:80 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "" -#: rhodecode/apps/admin/navigation.py:89 -#: rhodecode/integrations/types/email.py:232 +#: rhodecode/apps/admin/navigation.py:82 +#: rhodecode/integrations/types/email.py:233 #: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 @@ -58,15 +79,15 @@ msgstr "" msgid "Email" msgstr "E-Mail" -#: rhodecode/apps/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:84 msgid "Hooks" msgstr "" -#: rhodecode/apps/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:86 msgid "Full Text Search" msgstr "Volltextsuche" -#: rhodecode/apps/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:88 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -80,28 +101,28 @@ msgstr "Volltextsuche" #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 #: rhodecode/templates/admin/repos/repo_edit.mako:75 -#: rhodecode/templates/base/base.mako:82 +#: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "" -#: rhodecode/apps/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:90 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "Systeminformation" -#: rhodecode/apps/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:92 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:94 msgid "User Sessions" msgstr "" -#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/apps/admin/navigation.py:96 msgid "Open Source Licenses" msgstr "Open Source Lizenzen" -#: rhodecode/apps/admin/navigation.py:109 +#: rhodecode/apps/admin/navigation.py:101 msgid "Labs" msgstr "" @@ -113,13 +134,13 @@ msgstr "Standardeinstellungen erfolgreich aktualisiert" msgid "Error occurred during update of default values" msgstr "Fehler bei der Aktualisierung der Standardwerte aufgetreten" -#: rhodecode/apps/admin/views/permissions.py:121 +#: rhodecode/apps/admin/views/permissions.py:120 msgid "Application permissions updated successfully" msgstr "Anwendungs-Berechtigungen erfolgreich aktualisiert" -#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:141 #: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:287 +#: rhodecode/apps/admin/views/permissions.py:288 msgid "Error occurred during update of permissions" msgstr "Fehler bei der Aktualisierung der Berechtigungen aufgetreten" @@ -127,11 +148,11 @@ msgstr "Fehler bei der Aktualisierung der Berechtigungen aufgetreten" msgid "Object permissions updated successfully" msgstr "Objekt-Berechtigungen erfolgreich aktualisiert" -#: rhodecode/apps/admin/views/permissions.py:267 +#: rhodecode/apps/admin/views/permissions.py:268 msgid "Global permissions updated successfully" msgstr "Globale Berechtigungen erfolgreich aktualisiert" -#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/apps/admin/views/permissions.py:450 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:208 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -152,20 +173,20 @@ msgstr "Globale Berechtigungen erfolgreich aktualisiert" msgid "Edit" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:476 +#: rhodecode/apps/admin/views/permissions.py:478 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:479 +#: rhodecode/apps/admin/views/permissions.py:481 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:180 +#: rhodecode/apps/admin/views/repo_groups.py:181 #, python-format msgid "Created repository group %s" msgstr "Repository-Gruppe %s erstellt" -#: rhodecode/apps/admin/views/repo_groups.py:198 +#: rhodecode/apps/admin/views/repo_groups.py:199 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Fehler bei der Erstellung der Repository-Gruppe %s" @@ -174,10 +195,86 @@ msgstr "Fehler bei der Erstellung der Repository-Gruppe %s" msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/apps/admin/views/sessions.py:98 +#: rhodecode/apps/admin/views/sessions.py:97 msgid "Failed to cleanup up old sessions" msgstr "" +#: rhodecode/apps/admin/views/settings.py:162 +#: rhodecode/apps/admin/views/settings.py:708 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +msgid "Some form inputs contain invalid data." +msgstr "Einige Eingabefelder enthalten ungültige Daten." + +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:351 +msgid "Error occurred during updating application settings" +msgstr "Fehler während der Aktualisierung der Applikations-Einstellungen aufgetreten" + +#: rhodecode/apps/admin/views/settings.py:194 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +msgid "Updated VCS settings" +msgstr "VCS-Einstellungen aktualisiert" + +#: rhodecode/apps/admin/views/settings.py:268 +#, python-format +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "Repositories erfolgreich gescannt, hinzugefügt: %s; entfernt: %s" + +#: rhodecode/apps/admin/views/settings.py:347 +msgid "Updated application settings" +msgstr "Applikations-Einstellungen aktualisiert" + +#: rhodecode/apps/admin/views/settings.py:426 +msgid "Updated visualisation settings" +msgstr "Visualisierungs-Einstellungen aktualisiert" + +#: rhodecode/apps/admin/views/settings.py:429 +msgid "Error occurred during updating visualisation settings" +msgstr "Fehler bei der Aktualisierung der Visualisierungs-Einstellungen" + +#: rhodecode/apps/admin/views/settings.py:491 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +msgid "Invalid issue tracker pattern: {}" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:508 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:526 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 +msgid "Removed issue tracker entry" +msgstr "Ein Eintrag wurde aus dem Issue Tracker gelöscht." + +#: rhodecode/apps/admin/views/settings.py:563 +msgid "Please enter email address" +msgstr "Bitte E-Mail-Adresse eingeben" + +#: rhodecode/apps/admin/views/settings.py:581 +msgid "Send email task created" +msgstr "Aufgabe zum Senden der E-Mail erstellt" + +#: rhodecode/apps/admin/views/settings.py:631 +msgid "Added new hook" +msgstr "Neuer Hook hinzugefügt" + +#: rhodecode/apps/admin/views/settings.py:646 +msgid "Updated hooks" +msgstr "Die Hooks wurden aktutalisiert" + +#: rhodecode/apps/admin/views/settings.py:650 +msgid "Error occurred during hook creation" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:732 +msgid "Error occurred during updating labs settings" +msgstr "Fehler bei der Aktualisierung der Labs-Einstellungen aufgetreten" + +#: rhodecode/apps/admin/views/settings.py:737 +msgid "Updated Labs settings" +msgstr "Labs-Einstellungen aktualisiert" + #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "Apache-Konfiguration für Subversion erzeugt." @@ -186,149 +283,153 @@ msgstr "Apache-Konfiguration für Subversion erzeugt." msgid "Failed to generate the Apache configuration for Subversion." msgstr "Apache-Konfiguration für Subversion konnte nicht erzeugt werden." -#: rhodecode/apps/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:79 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:102 +#: rhodecode/apps/admin/views/system_info.py:90 msgid "Update info" msgstr "Update Informationen" -#: rhodecode/apps/admin/views/system_info.py:104 +#: rhodecode/apps/admin/views/system_info.py:92 msgid "Check for updates" msgstr "Nach Updates suchen" -#: rhodecode/apps/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:97 msgid "RhodeCode Version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:110 +#: rhodecode/apps/admin/views/system_info.py:98 +msgid "Latest version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:99 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:111 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:112 +#: rhodecode/apps/admin/views/system_info.py:101 msgid "RhodeCode Configuration" msgstr "RhodeCode Konfiguration" -#: rhodecode/apps/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "RhodeCode Certificate" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:103 msgid "Workers" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:115 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Worker Type" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "Database" msgstr "Datenbank" -#: rhodecode/apps/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:109 msgid "Database version" msgstr "Datenbank Version" -#: rhodecode/apps/admin/views/system_info.py:124 +#: rhodecode/apps/admin/views/system_info.py:113 msgid "Platform" msgstr "Plattform" -#: rhodecode/apps/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Platform UUID" msgstr "Plattform UUID" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Python version" msgstr "Python Version" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:116 msgid "Python path" msgstr "Python Pfad" -#: rhodecode/apps/admin/views/system_info.py:131 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "CPU" msgstr "CPU" -#: rhodecode/apps/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Load" msgstr "Auslastung" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Memory" msgstr "Speicher" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:123 msgid "Uptime" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Storage location" msgstr "Ablageort" -#: rhodecode/apps/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Storage info" msgstr "Information zur Ablage" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Storage inodes" msgstr "Inodes der Ablage " -#: rhodecode/apps/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "Gist storage location" msgstr "Gist Ablageort" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Gist storage info" msgstr "Information zur Gist Ablage" -#: rhodecode/apps/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Archive cache storage location" msgstr "Archivcache-Ablageort" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:148 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Temp storage location" msgstr "Temporärer Ablageort" -#: rhodecode/apps/admin/views/system_info.py:149 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Temp storage info" msgstr "Information zur temporären Ablage" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Search info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Search location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:156 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "VCS Backends" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:157 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "VCS Server" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:158 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "GIT" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:159 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "HG" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:160 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "SVN" msgstr "" @@ -342,188 +443,188 @@ msgstr "Benutzergruppe %(user_group_link)s erstellt" 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 +#: rhodecode/apps/admin/views/users.py:209 #, python-format msgid "Created user %(user_link)s" msgstr "Benutzer %(user_link)s erstellt" -#: rhodecode/apps/admin/views/users.py:229 +#: rhodecode/apps/admin/views/users.py:230 #, 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 +#: rhodecode/apps/admin/views/users.py:304 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 +#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/my_account/views/my_account.py:490 #, 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 +#: rhodecode/apps/admin/views/users.py:354 #, python-format msgid "Detached %s repositories" msgstr "%s Repositories abgetrennt" -#: rhodecode/apps/admin/views/users.py:358 +#: rhodecode/apps/admin/views/users.py:359 #, python-format msgid "Deleted %s repositories" msgstr "%s Repositories gelöscht" -#: rhodecode/apps/admin/views/users.py:366 +#: rhodecode/apps/admin/views/users.py:367 #, python-format msgid "Detached %s repository groups" msgstr "%s Repository-Gruppen abgetrennt" -#: rhodecode/apps/admin/views/users.py:371 +#: rhodecode/apps/admin/views/users.py:372 #, python-format msgid "Deleted %s repository groups" msgstr "%s Repository-Gruppen gelöscht" -#: rhodecode/apps/admin/views/users.py:379 +#: rhodecode/apps/admin/views/users.py:380 #, python-format msgid "Detached %s user groups" msgstr "%s Benutzergruppen abgetrennt" -#: rhodecode/apps/admin/views/users.py:384 +#: rhodecode/apps/admin/views/users.py:385 #, python-format msgid "Deleted %s user groups" msgstr "%s Benutzergruppen gelöscht" -#: rhodecode/apps/admin/views/users.py:401 +#: rhodecode/apps/admin/views/users.py:402 msgid "Successfully deleted user" msgstr "Benutzer erfolgreich gelöscht" -#: rhodecode/apps/admin/views/users.py:407 +#: rhodecode/apps/admin/views/users.py:408 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 +#: rhodecode/apps/admin/views/users.py:473 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 +#: rhodecode/apps/admin/views/users.py:479 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 +#: rhodecode/apps/admin/views/users.py:567 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 +#: rhodecode/apps/admin/views/users.py:585 +#: rhodecode/apps/user_group/views/__init__.py:448 msgid "An error occurred during permissions saving" msgstr "Fehler beim Speichern der Berechtigungen aufgetreten" -#: rhodecode/apps/admin/views/users.py:608 +#: rhodecode/apps/admin/views/users.py:610 msgid "Force password change disabled for user" msgstr "Erzwungene Passwortänderung inaktiv für Benutzer" -#: rhodecode/apps/admin/views/users.py:613 +#: rhodecode/apps/admin/views/users.py:615 msgid "Force password change enabled for user" msgstr "Erzwungene Passwortänderung aktiv für Benutzer" -#: rhodecode/apps/admin/views/users.py:622 +#: rhodecode/apps/admin/views/users.py:624 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 +#: rhodecode/apps/admin/views/users.py:663 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:667 +#: rhodecode/apps/admin/views/users.py:669 #, python-format msgid "Created repository group `%s`" msgstr "Repository-Gruppe %s erstellt" -#: rhodecode/apps/admin/views/users.py:671 +#: rhodecode/apps/admin/views/users.py:673 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:676 +#: rhodecode/apps/admin/views/users.py:678 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/apps/admin/views/users.py:701 +#: rhodecode/apps/my_account/views/my_account.py:160 #: 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:737 -#: rhodecode/apps/my_account/views/my_account.py:193 +#: rhodecode/apps/admin/views/users.py:739 +#: rhodecode/apps/my_account/views/my_account.py:194 msgid "Auth token successfully created" msgstr "Authentifizierungstoken erfolgreich erstellt" -#: rhodecode/apps/admin/views/users.py:766 -#: rhodecode/apps/my_account/views/my_account.py:217 +#: rhodecode/apps/admin/views/users.py:768 +#: rhodecode/apps/my_account/views/my_account.py:218 msgid "Auth token successfully deleted" msgstr "Authentifizierungstoken erfolgreich gelöscht" -#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/admin/views/users.py:840 #: 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/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:849 #: 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/admin/views/users.py:883 #: 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 +#: rhodecode/apps/admin/views/users.py:929 +#: rhodecode/apps/my_account/views/my_account.py:260 #, 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:928 +#: rhodecode/apps/admin/views/users.py:935 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 +#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/my_account/views/my_account.py:266 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:959 +#: rhodecode/apps/admin/views/users.py:966 msgid "Removed email address from user account" msgstr "E-Mail-Adresse von Benutzerkonto entfernt" -#: rhodecode/apps/admin/views/users.py:1005 +#: rhodecode/apps/admin/views/users.py:1012 #, 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:1023 +#: rhodecode/apps/admin/views/users.py:1034 msgid "An error occurred during ip saving" msgstr "Fehler beim Speichern der IP-Adresse aufgetreten" -#: rhodecode/apps/admin/views/users.py:1027 +#: rhodecode/apps/admin/views/users.py:1038 #, 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:1057 +#: rhodecode/apps/admin/views/users.py:1068 msgid "Removed ip address from user whitelist" msgstr "IP-Adressen von der Whitelist des Benutzers entfernt" -#: rhodecode/apps/admin/views/users.py:1122 +#: rhodecode/apps/admin/views/users.py:1133 msgid "Groups successfully changed" msgstr "" @@ -548,10 +649,10 @@ 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 +#: rhodecode/public/js/rhodecode-components.js:49320 +#: rhodecode/public/js/scripts.js:41124 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/src/rhodecode.js:538 msgid "Lifetime" msgstr "Lebensdauer" @@ -602,75 +703,75 @@ msgstr "" 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/apps/home/views.py:218 rhodecode/apps/home/views.py:251 +#: rhodecode/apps/repository/views/repo_pull_requests.py:719 +#: rhodecode/templates/admin/my_account/my_account.mako:41 #: 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:580 +#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:150 +#: rhodecode/templates/base/base.mako:582 msgid "Repositories" msgstr "Repositories" -#: rhodecode/apps/home/views.py:241 +#: rhodecode/apps/home/views.py:244 msgid "Groups" msgstr "Gruppen" -#: rhodecode/apps/home/views.py:261 +#: rhodecode/apps/home/views.py:264 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "Öffentliches Journal" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 msgid "journal" msgstr "Logbuch" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:281 +#: rhodecode/apps/login/views.py:288 msgid "You have successfully registered with RhodeCode" msgstr "Du hast dich erfolgreich bei RhodeCode angemeldet" -#: rhodecode/apps/login/views.py:317 +#: rhodecode/apps/login/views.py:325 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:323 +#: rhodecode/apps/login/views.py:331 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:412 +#: rhodecode/apps/login/views.py:420 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:428 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/my_account.py:134 +#: rhodecode/apps/my_account/views/my_account.py:135 msgid "Error occurred during update of user password" msgstr "Fehler bei der Aktualisierung des Benutzerpassworts aufgetreten" -#: rhodecode/apps/my_account/views/my_account.py:141 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "Passwort erfolgreich aktualisiert" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:288 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:465 +#: rhodecode/apps/my_account/views/my_account.py:470 msgid "Your account was updated successfully" msgstr "Ihr Account wurde erfolgreich aktualisiert" @@ -685,7 +786,7 @@ 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 +#: rhodecode/apps/user_group/views/__init__.py:328 msgid "Cannot change permission for yourself as admin" msgstr "Es ist nicht möglich als Administrator die eigenen Berechtigungen zu ändern" @@ -712,28 +813,28 @@ msgstr "Währen der Cache Invalidierung trat ein Fehler auf" #: 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:585 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_commits.py:192 #: 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 +#: rhodecode/apps/repository/views/repo_checks.py:98 #, python-format msgid "Created repository %s from %s" msgstr "Repository %s von %s erstellt" -#: rhodecode/apps/repository/views/repo_checks.py:104 +#: rhodecode/apps/repository/views/repo_checks.py:107 #, python-format msgid "Forked repository %s as %s" msgstr "Repository %s als %s geforkt" -#: rhodecode/apps/repository/views/repo_checks.py:107 +#: rhodecode/apps/repository/views/repo_checks.py:110 #, python-format msgid "Created repository %s" msgstr "Repository %s erstellt" @@ -762,13 +863,13 @@ msgstr "" msgid "Increase context for all diffs" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:389 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#: rhodecode/apps/repository/views/repo_commits.py:388 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1129 #, 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 +#: rhodecode/apps/repository/views/repo_commits.py:432 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -850,14 +951,14 @@ 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/apps/repository/views/repo_summary.py:322 +#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 #: 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 +#: rhodecode/model/scm.py:804 rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "Tags" @@ -918,12 +1019,12 @@ msgid "" "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 +#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "Vergleiche Fork" -#: rhodecode/apps/repository/views/repo_forks.py:250 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "Währen des Forken des Repositorys trat ein Fehler auf: %s" @@ -932,91 +1033,88 @@ msgstr "Währen des Forken des Repositorys trat ein Fehler auf: %s" msgid "Repository permissions updated" msgstr "Repository Berechtigungen aktualisiert" -#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +#: rhodecode/apps/repository/views/repo_pull_requests.py:615 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:750 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +#: rhodecode/apps/repository/views/repo_pull_requests.py:775 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +#: rhodecode/apps/repository/views/repo_pull_requests.py:790 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +#: rhodecode/apps/repository/views/repo_pull_requests.py:841 msgid "Successfully opened new pull request" msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +#: rhodecode/apps/repository/views/repo_pull_requests.py:844 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +#: rhodecode/apps/repository/views/repo_pull_requests.py:875 +#: rhodecode/apps/repository/views/repo_pull_requests.py:905 msgid "Cannot update closed pull requests." msgstr "Geschlossener Pullrequest kann nicht aktualisiert werden." -#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +#: rhodecode/apps/repository/views/repo_pull_requests.py:911 msgid "Pull request title & description updated." msgstr "Pullrequest Überschrift und Beschreibung aktualisiert." -#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:946 msgid "Reload page" msgstr "Seite neu laden" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1010 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1034 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1060 msgid "Successfully deleted pull request" msgstr "Pullrequest erfolgreich gelöscht" -#: rhodecode/apps/repository/views/repo_settings.py:167 +#: rhodecode/apps/repository/views/repo_settings.py:168 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:193 +#: rhodecode/apps/repository/views/repo_settings.py:194 msgid "Unlocked" msgstr "Entsperrt" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:199 msgid "Locked" msgstr "Gesperrt" -#: rhodecode/apps/repository/views/repo_settings.py:200 +#: rhodecode/apps/repository/views/repo_settings.py:201 #, 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.py:205 #: 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 +#: rhodecode/apps/repository/views/repo_settings.py:249 msgid "An error occurred during deletion of repository stats" msgstr "Fehler während des Löschens der Repository-Statistik aufgetreten" @@ -1079,28 +1177,18 @@ msgstr "Gesperrtes Respository" msgid "Unlocked repository" msgstr "Entsperrtes Repository" -#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +#: rhodecode/apps/repository/views/repo_settings_fields.py:86 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 +#: rhodecode/apps/repository/views/repo_settings_fields.py:108 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 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86 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" @@ -1109,34 +1197,23 @@ msgstr "Von entferntem Ort übertragen" 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 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Branch" msgstr "Branch" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Tag" msgstr "Tag" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:299 msgid "Bookmark" msgstr "Lesezeichen" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:323 msgid "Closed branches" msgstr "Geschlossene Branches" @@ -1148,41 +1225,41 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:209 +#: rhodecode/apps/user_group/views/__init__.py:184 #, python-format msgid "Updated user group %s" msgstr "Benutzergruppe %s aktualisiert" -#: rhodecode/apps/user_group/views/__init__.py:231 +#: rhodecode/apps/user_group/views/__init__.py:206 #, 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 +#: rhodecode/apps/user_group/views/__init__.py:232 msgid "Successfully deleted user group" msgstr "Benutzergruppe erfolgreich gelöscht" -#: rhodecode/apps/user_group/views/__init__.py:262 +#: rhodecode/apps/user_group/views/__init__.py:237 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 +#: rhodecode/apps/user_group/views/__init__.py:341 msgid "Target group cannot be the same" msgstr "Zielgruppe kann nicht die gleiche sein" -#: rhodecode/apps/user_group/views/__init__.py:381 +#: rhodecode/apps/user_group/views/__init__.py:356 msgid "User Group permissions updated" msgstr "Berechtigungen der Benutzergruppe aktualisiert" -#: rhodecode/apps/user_group/views/__init__.py:452 +#: rhodecode/apps/user_group/views/__init__.py:428 msgid "User Group global permissions updated successfully" msgstr "Globale Berechtigungen der Benutzergruppe aktualisiert" -#: rhodecode/apps/user_group/views/__init__.py:534 +#: rhodecode/apps/user_group/views/__init__.py:510 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:538 +#: rhodecode/apps/user_group/views/__init__.py:514 msgid "An error occurred during synchronization update" msgstr "" @@ -1209,20 +1286,20 @@ msgstr "" msgid "Auth Cache TTL" msgstr "" -#: rhodecode/authentication/views.py:90 +#: rhodecode/authentication/views.py:93 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:170 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:181 +#: rhodecode/authentication/views.py:173 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:191 +#: rhodecode/authentication/views.py:181 msgid "Error occurred during update of auth settings." msgstr "" @@ -1347,11 +1424,11 @@ msgid "Password to authenticate for given user DN." msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 -#: rhodecode/integrations/types/webhook.py:214 +#: rhodecode/integrations/types/webhook.py:220 #: 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:324 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Passwort" @@ -1475,56 +1552,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:286 -msgid "Error occurred during updating application settings" -msgstr "Fehler während der Aktualisierung der Applikations-Einstellungen aufgetreten" - -#: rhodecode/controllers/admin/settings.py:226 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "Repositories erfolgreich gescannt, hinzugefügt: %s; entfernt: %s" - -#: rhodecode/controllers/admin/settings.py:282 -msgid "Updated application settings" -msgstr "Applikations-Einstellungen aktualisiert" - -#: rhodecode/controllers/admin/settings.py:348 -msgid "Updated visualisation settings" -msgstr "Visualisierungs-Einstellungen aktualisiert" - -#: rhodecode/controllers/admin/settings.py:351 -msgid "Error occurred during updating visualisation settings" -msgstr "Fehler bei der Aktualisierung der Visualisierungs-Einstellungen" - -#: rhodecode/controllers/admin/settings.py:444 -msgid "Please enter email address" -msgstr "Bitte E-Mail-Adresse eingeben" - -#: rhodecode/controllers/admin/settings.py:462 -msgid "Send email task created" -msgstr "Aufgabe zum Senden der E-Mail erstellt" - -#: rhodecode/controllers/admin/settings.py:495 -msgid "Added new hook" -msgstr "Neuer Hook hinzugefügt" - -#: rhodecode/controllers/admin/settings.py:510 -msgid "Updated hooks" -msgstr "Die Hooks wurden aktutalisiert" - -#: rhodecode/controllers/admin/settings.py:514 -msgid "Error occurred during hook creation" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:643 -msgid "Error occurred during updating labs settings" -msgstr "Fehler bei der Aktualisierung der Labs-Einstellungen aufgetreten" - -#: rhodecode/controllers/admin/settings.py:648 -msgid "Updated Labs settings" -msgstr "Labs-Einstellungen aktualisiert" - #: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" @@ -1549,35 +1576,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:149 +#: rhodecode/events/repo.py:189 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:158 +#: rhodecode/events/repo.py:198 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:167 +#: rhodecode/events/repo.py:207 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:176 +#: rhodecode/events/repo.py:216 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:256 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:265 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:274 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:285 msgid "repository push" msgstr "" @@ -1628,7 +1655,7 @@ msgstr "" #: 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:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:215 #: 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 @@ -1656,9 +1683,9 @@ msgstr "Zurücksetzen" #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: 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/changeset/changeset_file_comment.mako:143 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:148 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1721,81 +1748,81 @@ msgstr "" msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:302 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:327 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:214 +#: rhodecode/integrations/types/email.py:215 msgid "Recipients" msgstr "Empfänger" -#: rhodecode/integrations/types/email.py:215 +#: rhodecode/integrations/types/email.py:216 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:220 #: rhodecode/integrations/types/email.py:221 +#: rhodecode/integrations/types/email.py:222 msgid "Email address" msgstr "E-Mail-Adresse" -#: rhodecode/integrations/types/email.py:233 +#: rhodecode/integrations/types/email.py:234 msgid "Send repo push summaries to a list of recipients via email" msgstr "" -#: rhodecode/integrations/types/hipchat.py:43 +#: rhodecode/integrations/types/hipchat.py:41 msgid "Yellow" msgstr "Gelb" -#: rhodecode/integrations/types/hipchat.py:44 +#: rhodecode/integrations/types/hipchat.py:42 msgid "Red" msgstr "Rot" -#: rhodecode/integrations/types/hipchat.py:45 +#: rhodecode/integrations/types/hipchat.py:43 msgid "Green" msgstr "Grün" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Purple" msgstr "Violett" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Gray" msgstr "Grau" -#: rhodecode/integrations/types/hipchat.py:52 +#: rhodecode/integrations/types/hipchat.py:50 msgid "Hipchat server URL" msgstr "" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:51 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:63 +#: rhodecode/integrations/types/hipchat.py:61 msgid "Notify" msgstr "" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:62 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:70 +#: rhodecode/integrations/types/hipchat.py:68 msgid "Color" msgstr "Farbe" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:69 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:99 +#: rhodecode/integrations/types/hipchat.py:97 msgid "Hipchat" msgstr "" -#: rhodecode/integrations/types/hipchat.py:100 +#: rhodecode/integrations/types/hipchat.py:98 msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" @@ -1811,7 +1838,7 @@ msgid "" msgstr "" #: rhodecode/integrations/types/slack.py:60 -#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/integrations/types/webhook.py:210 #: 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 @@ -1822,7 +1849,7 @@ msgstr "" #: 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:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1858,11 +1885,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:177 +#: rhodecode/integrations/types/webhook.py:183 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:185 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 " @@ -1870,53 +1897,53 @@ msgid "" "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:199 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:194 +#: rhodecode/integrations/types/webhook.py:200 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 +#: rhodecode/integrations/types/webhook.py:211 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:215 +#: rhodecode/integrations/types/webhook.py:221 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:225 +#: rhodecode/integrations/types/webhook.py:231 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:226 +#: rhodecode/integrations/types/webhook.py:232 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:235 +#: rhodecode/integrations/types/webhook.py:241 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:236 +#: rhodecode/integrations/types/webhook.py:242 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:245 +#: rhodecode/integrations/types/webhook.py:251 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:246 +#: rhodecode/integrations/types/webhook.py:252 msgid "Select if the Webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:259 +#: rhodecode/integrations/types/webhook.py:265 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:260 +#: rhodecode/integrations/types/webhook.py:266 msgid "Post json events to a Webhook endpoint" msgstr "" @@ -2004,80 +2031,63 @@ msgstr "[beginnt zu folgen] Repository" msgid "[stopped following] repository" msgstr "[folgt nicht mehr] Repository" -#: rhodecode/lib/action_parser.py:171 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "Fork Name %s" -#: rhodecode/lib/action_parser.py:189 +#: rhodecode/lib/action_parser.py:191 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "Pullrequest #%s" -#: rhodecode/lib/action_parser.py:223 +#: rhodecode/lib/action_parser.py:226 #, python-format msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:228 +#: rhodecode/lib/action_parser.py:231 msgid "compare view" msgstr "vergleichsansicht" -#: rhodecode/lib/action_parser.py:235 +#: rhodecode/lib/action_parser.py:238 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:288 +#: rhodecode/lib/action_parser.py:293 #, python-format msgid "Deleted branch: %s" msgstr "Gelöschter Branch: %s" -#: rhodecode/lib/action_parser.py:291 +#: rhodecode/lib/action_parser.py:296 #, python-format msgid "Created tag: %s" msgstr "Tag erstellt: %s" -#: rhodecode/lib/action_parser.py:304 +#: rhodecode/lib/action_parser.py:309 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1445 +#: rhodecode/lib/auth.py:1441 #, python-format msgid "IP %s not allowed" msgstr "IP-Adresse %s nicht erlaubt" -#: rhodecode/lib/auth.py:1535 +#: rhodecode/lib/auth.py:1531 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:1577 +#: rhodecode/lib/auth.py:1575 msgid "You need to be signed in to view this page" msgstr "Sie müssen angemeldet sein, um diese Seite zu betrachten" -#: rhodecode/lib/diffs.py:62 -msgid "Click to comment" -msgstr "" - -#: rhodecode/lib/diffs.py:77 -msgid "Binary file" -msgstr "Binärdatei" - -#: rhodecode/lib/diffs.py:98 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das Diff Menü um die Unterschiede anzuzeigen" - -#: rhodecode/lib/diffs.py:109 -msgid "No changes detected" -msgstr "Keine Änderungen erkannt" - -#: rhodecode/lib/diffs.py:927 +#: rhodecode/lib/diffs.py:864 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1869 +#: rhodecode/lib/helpers.py:1855 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2097,7 +2107,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1893 +#: rhodecode/lib/helpers.py:1879 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2111,49 +2121,49 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1910 +#: rhodecode/lib/helpers.py:1896 #, 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:525 +#: rhodecode/lib/utils2.py:524 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:531 +#: rhodecode/lib/utils2.py:530 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:540 +#: rhodecode/lib/utils2.py:539 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:542 +#: rhodecode/lib/utils2.py:541 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:544 +#: rhodecode/lib/utils2.py:543 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:546 +#: rhodecode/lib/utils2.py:545 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:548 +#: rhodecode/lib/utils2.py:547 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:550 +#: rhodecode/lib/utils2.py:549 msgid "in ${val} and ${detail}" msgstr "" -#: 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/lib/utils2.py:553 +#: rhodecode/public/js/rhodecode-components.js:30702 +#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "jetzt gerade" @@ -2181,6 +2191,7 @@ msgstr "jetzt gerade" #: 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_11_0_0.py:2599 #: 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 @@ -2189,7 +2200,7 @@ msgstr "jetzt gerade" #: 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 +#: rhodecode/model/db.py:2626 msgid "Repository no access" msgstr "Kein Zugriff auf Repository" @@ -2216,6 +2227,7 @@ msgstr "Kein Zugriff auf Repository" #: 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_11_0_0.py:2600 #: 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 @@ -2224,7 +2236,7 @@ msgstr "Kein Zugriff auf Repository" #: 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 +#: rhodecode/model/db.py:2627 msgid "Repository read access" msgstr "Lesender Zugriff auf Repository" @@ -2251,6 +2263,7 @@ msgstr "Lesender Zugriff auf Repository" #: 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_11_0_0.py:2601 #: 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 @@ -2259,7 +2272,7 @@ msgstr "Lesender Zugriff auf Repository" #: 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 +#: rhodecode/model/db.py:2628 msgid "Repository write access" msgstr "Schreibdender Zugriff auf Repository" @@ -2286,6 +2299,7 @@ msgstr "Schreibdender Zugriff auf Repository" #: 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_11_0_0.py:2602 #: 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 @@ -2294,7 +2308,7 @@ msgstr "Schreibdender Zugriff auf Repository" #: 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 +#: rhodecode/model/db.py:2629 msgid "Repository admin access" msgstr "Administrativer Zugang zum Repository" @@ -2361,6 +2375,7 @@ msgstr "RhodeCode Administrator" #: 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_11_0_0.py:2620 #: 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 @@ -2369,7 +2384,7 @@ msgstr "RhodeCode Administrator" #: 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 +#: rhodecode/model/db.py:2647 msgid "Repository creation disabled" msgstr "Repository erstelllung deaktiviert" @@ -2396,6 +2411,7 @@ msgstr "Repository erstelllung deaktiviert" #: 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_11_0_0.py:2621 #: 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 @@ -2404,7 +2420,7 @@ msgstr "Repository erstelllung deaktiviert" #: 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 +#: rhodecode/model/db.py:2648 msgid "Repository creation enabled" msgstr "Repository erstellung aktiviert" @@ -2431,6 +2447,7 @@ msgstr "Repository erstellung aktiviert" #: 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_11_0_0.py:2625 #: 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 @@ -2439,7 +2456,7 @@ msgstr "Repository erstellung aktiviert" #: 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 +#: rhodecode/model/db.py:2652 msgid "Repository forking disabled" msgstr "Repository Forken deaktiviert" @@ -2466,6 +2483,7 @@ msgstr "Repository Forken deaktiviert" #: 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_11_0_0.py:2626 #: 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 @@ -2474,7 +2492,7 @@ msgstr "Repository Forken deaktiviert" #: 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 +#: rhodecode/model/db.py:2653 msgid "Repository forking enabled" msgstr "Repository Forken aktiviert" @@ -2522,6 +2540,7 @@ msgstr "Registrierung neuer Benutzer in RhodeCode mit Automatischer Aktivierung" #: 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_11_0_0.py:3328 #: 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 @@ -2530,7 +2549,11 @@ msgstr "Registrierung neuer Benutzer in RhodeCode mit Automatischer Aktivierung" #: 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 +#: rhodecode/model/db.py:3355 +#: rhodecode/public/js/rhodecode-components.js:48211 +#: rhodecode/public/js/scripts.js:40015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "Not Reviewed" msgstr "Nicht Begutachtet" @@ -2557,6 +2580,7 @@ msgstr "Nicht Begutachtet" #: 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_11_0_0.py:3329 #: 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 @@ -2565,7 +2589,7 @@ msgstr "Nicht Begutachtet" #: 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 +#: rhodecode/model/db.py:3356 msgid "Approved" msgstr "Akzeptiert" @@ -2592,6 +2616,7 @@ msgstr "Akzeptiert" #: 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_11_0_0.py:3330 #: 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 @@ -2600,7 +2625,7 @@ msgstr "Akzeptiert" #: 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 +#: rhodecode/model/db.py:3357 msgid "Rejected" msgstr "Abgelehnt" @@ -2627,6 +2652,7 @@ msgstr "Abgelehnt" #: 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_11_0_0.py:3331 #: 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 @@ -2635,7 +2661,7 @@ msgstr "Abgelehnt" #: 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 +#: rhodecode/model/db.py:3358 msgid "Under Review" msgstr "In Begutachtung" @@ -2659,6 +2685,7 @@ msgstr "In Begutachtung" #: 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_11_0_0.py:2604 #: 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 @@ -2667,7 +2694,7 @@ msgstr "In Begutachtung" #: 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 +#: rhodecode/model/db.py:2631 msgid "Repository group no access" msgstr "" @@ -2691,6 +2718,7 @@ msgstr "" #: 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_11_0_0.py:2605 #: 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 @@ -2699,7 +2727,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2632 msgid "Repository group read access" msgstr "" @@ -2723,6 +2751,7 @@ msgstr "" #: 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_11_0_0.py:2606 #: 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 @@ -2731,7 +2760,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2633 msgid "Repository group write access" msgstr "" @@ -2755,6 +2784,7 @@ msgstr "" #: 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_11_0_0.py:2607 #: 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 @@ -2763,7 +2793,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2634 msgid "Repository group admin access" msgstr "" @@ -2786,6 +2816,7 @@ msgstr "" #: 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_11_0_0.py:2609 #: 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 @@ -2794,7 +2825,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2636 msgid "User group no access" msgstr "" @@ -2817,6 +2848,7 @@ msgstr "" #: 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_11_0_0.py:2610 #: 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 @@ -2825,7 +2857,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2637 msgid "User group read access" msgstr "" @@ -2848,6 +2880,7 @@ msgstr "" #: 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_11_0_0.py:2611 #: 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 @@ -2856,7 +2889,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2638 msgid "User group write access" msgstr "" @@ -2879,6 +2912,7 @@ msgstr "" #: 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_11_0_0.py:2612 #: 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 @@ -2887,7 +2921,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2639 msgid "User group admin access" msgstr "" @@ -2910,6 +2944,7 @@ msgstr "" #: 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_11_0_0.py:2614 #: 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 @@ -2918,7 +2953,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2641 msgid "Repository Group creation disabled" msgstr "" @@ -2941,6 +2976,7 @@ msgstr "" #: 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_11_0_0.py:2615 #: 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 @@ -2949,7 +2985,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2642 msgid "Repository Group creation enabled" msgstr "" @@ -2972,6 +3008,7 @@ msgstr "" #: 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_11_0_0.py:2617 #: 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 @@ -2980,7 +3017,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2644 msgid "User Group creation disabled" msgstr "" @@ -3003,6 +3040,7 @@ msgstr "" #: 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_11_0_0.py:2618 #: 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 @@ -3011,7 +3049,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2645 msgid "User Group creation enabled" msgstr "" @@ -3034,6 +3072,7 @@ msgstr "" #: 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_11_0_0.py:2628 #: 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 @@ -3042,7 +3081,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2655 msgid "Registration disabled" msgstr "" @@ -3065,6 +3104,7 @@ msgstr "" #: 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_11_0_0.py:2629 #: 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 @@ -3073,7 +3113,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2656 msgid "User Registration with manual account activation" msgstr "" @@ -3096,6 +3136,7 @@ msgstr "" #: 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_11_0_0.py:2630 #: 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 @@ -3104,7 +3145,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2657 msgid "User Registration with automatic account activation" msgstr "" @@ -3127,6 +3168,7 @@ msgstr "" #: 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_11_0_0.py:2636 #: 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 @@ -3135,7 +3177,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2663 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "" @@ -3158,6 +3200,7 @@ msgstr "" #: 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_11_0_0.py:2637 #: 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 @@ -3166,7 +3209,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2664 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "" @@ -3183,6 +3226,7 @@ msgstr "" #: 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_11_0_0.py:2622 #: 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 @@ -3191,7 +3235,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2649 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3209,6 +3253,7 @@ msgstr "" #: 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_11_0_0.py:2623 #: 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 @@ -3217,7 +3262,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2650 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3232,6 +3277,7 @@ msgstr "" #: 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_11_0_0.py:2597 #: 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 @@ -3240,7 +3286,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2624 msgid "RhodeCode Super Administrator" msgstr "" @@ -3252,6 +3298,7 @@ msgstr "" #: 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_11_0_0.py:2639 #: 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 @@ -3260,7 +3307,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2666 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3272,6 +3319,7 @@ msgstr "" #: 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_11_0_0.py:2640 #: 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 @@ -3280,10 +3328,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2667 msgid "Inherit object permissions from default user enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 #: 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 @@ -3292,10 +3341,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: 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 +#: rhodecode/model/db.py:1107 msgid "all" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3304,10 +3354,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: 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 +#: rhodecode/model/db.py:1108 msgid "http/web interface" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3316,10 +3367,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: 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 +#: rhodecode/model/db.py:1109 msgid "vcs (git/hg/svn protocol)" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3328,10 +3380,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: 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 +#: rhodecode/model/db.py:1110 msgid "api calls" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 #: 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 @@ -3340,10 +3393,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:1111 msgid "feed access" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 #: 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 @@ -3352,60 +3406,51 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2387 msgid "No parent" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 #: 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 +#: rhodecode/model/db.py:2659 msgid "Password reset enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 #: 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 +#: rhodecode/model/db.py:2660 msgid "Password reset hidden" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 #: 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 +#: rhodecode/model/db.py:2661 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:150 -msgid "Invalid search query. Try quoting it." -msgstr "Ungültige Suchanfrage. Versuchen sie die Anfrage in Anführungszeichen zu setzen." - -#: rhodecode/lib/index/whoosh.py:152 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer ausführen" - -#: rhodecode/lib/index/whoosh.py:157 -msgid "An error occurred during this search operation" -msgstr "Während dieser Suche trat ein Fehler auf" - -#: rhodecode/lib/index/whoosh.py:165 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:166 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" @@ -3425,28 +3470,28 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:382 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:376 +#: rhodecode/model/comment.py:383 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:87 +#: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "Bitte einen Benutzernamen eingeben" -#: rhodecode/model/forms.py:88 +#: rhodecode/model/forms.py:89 #, 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:98 +#: rhodecode/model/forms.py:99 msgid "Please enter a password" msgstr "Bitte ein Passwort eingeben" -#: rhodecode/model/forms.py:99 +#: rhodecode/model/forms.py:100 #, python-format msgid "Enter %(min)i characters or more" msgstr "Bitte mindestens %(min)i Zeichen eingeben" @@ -3533,8 +3578,8 @@ msgstr "Lesen" #: 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 -#: rhodecode/templates/changeset/changeset_file_comment.mako:321 +#: rhodecode/templates/changeset/changeset_file_comment.mako:272 +#: rhodecode/templates/changeset/changeset_file_comment.mako:322 msgid "Write" msgstr "Schreiben" @@ -3568,8 +3613,8 @@ 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:417 -#: rhodecode/templates/base/base.mako:424 +#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:426 msgid "Admin" msgstr "Admin" @@ -3686,115 +3731,79 @@ msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1218 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1168 +#: rhodecode/model/pull_request.py:1220 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1181 +#: rhodecode/model/pull_request.py:1233 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1200 +#: rhodecode/model/pull_request.py:1252 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1203 +#: rhodecode/model/pull_request.py:1255 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 +#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 msgid "Bookmarks" msgstr "Lesezeichen" -#: rhodecode/model/pull_request.py:1370 +#: rhodecode/model/pull_request.py:1425 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1373 +#: rhodecode/model/pull_request.py:1428 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1533 +#: rhodecode/model/pull_request.py:1588 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1546 +#: rhodecode/model/pull_request.py:1601 msgid "Pull request reviewer approval is pending." msgstr "Reviewer Zustimmung fehlt." -#: rhodecode/model/pull_request.py:1561 +#: rhodecode/model/pull_request.py:1616 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1564 +#: rhodecode/model/pull_request.py:1619 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1599 +#: rhodecode/model/pull_request.py:1654 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1604 +#: rhodecode/model/pull_request.py:1659 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1611 +#: rhodecode/model/pull_request.py:1666 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1613 +#: rhodecode/model/pull_request.py:1668 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:762 +#: rhodecode/model/scm.py:775 msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:166 -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:333 -#, python-format -msgid "" -"You can't edit this user (`%(username)s`) since it's crucial for entire " -"application" -msgstr "" - -#: 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: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: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:532 -#, python-format -msgid "" -"user \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups:%s" -msgstr "" - -#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99 +#: rhodecode/model/validators.py:92 rhodecode/model/validators.py:93 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:142 +#: rhodecode/model/validators.py:139 msgid "Pattern already exists" msgstr "" @@ -3815,30 +3824,26 @@ msgid "" "dashes and must begin with alphanumeric character or underscore" msgstr "" -#: rhodecode/model/validators.py:192 -msgid "The input is not valid" -msgstr "" - -#: rhodecode/model/validators.py:199 +#: rhodecode/model/validators.py:195 #, python-format msgid "Username %(username)s is not valid" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: rhodecode/model/validators.py:200 +#: rhodecode/model/validators.py:196 #, python-format msgid "Username %(username)s is disabled" msgstr "" -#: rhodecode/model/validators.py:223 +#: rhodecode/model/validators.py:221 msgid "Invalid user group name" msgstr "" -#: rhodecode/model/validators.py:224 +#: rhodecode/model/validators.py:222 #, python-format msgid "User group `%(usergroup)s` already exists" msgstr "" -#: rhodecode/model/validators.py:226 +#: rhodecode/model/validators.py:224 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -3866,166 +3871,166 @@ msgstr "" msgid "no permission to store repository group in root location" msgstr "" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:387 msgid "Invalid characters (non-ascii) in password" msgstr "Üngültige(nicht ASCII) Zeichen im Passwort" -#: rhodecode/model/validators.py:401 -msgid "Invalid old password" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:406 msgid "Passwords do not match" msgstr "Die Passwörter stimmen nicht überein" -#: rhodecode/model/validators.py:436 +#: rhodecode/model/validators.py:426 msgid "invalid password" msgstr "Ungültiges Passwort" -#: rhodecode/model/validators.py:437 +#: rhodecode/model/validators.py:427 msgid "invalid user name" msgstr "Ungültiger Benutzername" -#: rhodecode/model/validators.py:438 +#: rhodecode/model/validators.py:428 msgid "Your account is disabled" msgstr "Ihr Account wurde Deaktiviert" -#: rhodecode/model/validators.py:470 -msgid "Token mismatch" -msgstr "Schlüssel stimmt nicht überein" - -#: rhodecode/model/validators.py:484 +#: rhodecode/model/validators.py:464 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Repository Name \"%(repo)s\" ist verboten" -#: rhodecode/model/validators.py:486 +#: rhodecode/model/validators.py:466 #, python-format msgid "Repository with name %(repo)s already exists" msgstr "" -#: rhodecode/model/validators.py:488 +#: rhodecode/model/validators.py:468 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:491 +#: rhodecode/model/validators.py:471 #, python-format msgid "Repository with name %(repo)s exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:493 +#: rhodecode/model/validators.py:473 #, python-format msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:566 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219 msgid "Repository name cannot end with .git" msgstr "" -#: rhodecode/model/validators.py:640 +#: rhodecode/model/validators.py:626 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "" -#: rhodecode/model/validators.py:641 +#: rhodecode/model/validators.py:627 #, python-format msgid "" "Invalid clone url, provide a valid clone url starting with one of " "%(allowed_prefixes)s" msgstr "" -#: rhodecode/model/validators.py:670 +#: rhodecode/model/validators.py:659 msgid "Fork have to be the same type as parent" msgstr "Forke um den selben typ wie der Vorgesetze zu haben" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:676 msgid "You do not have the permission to create repositories in this group." msgstr "" -#: rhodecode/model/validators.py:688 +#: rhodecode/model/validators.py:679 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "" "You do not have the permission to store repositories in the root location." msgstr "" -#: rhodecode/model/validators.py:748 +#: rhodecode/model/validators.py:739 msgid "This username or user group name is not valid" msgstr "" -#: rhodecode/model/validators.py:879 +#: rhodecode/model/validators.py:852 msgid "This is not a valid path" msgstr "Dies ist ein Ungültiger Pfad" -#: rhodecode/model/validators.py:894 +#: rhodecode/model/validators.py:870 msgid "This e-mail address is already taken" msgstr "Diese EMail Addresse ist schon in Benutzung" -#: rhodecode/model/validators.py:914 +#: rhodecode/model/validators.py:892 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "E-Mail-Adresse \"%(email)s\" existiert nicht." -#: rhodecode/model/validators.py:935 +#: rhodecode/model/validators.py:913 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:966 -#: rhodecode/model/validation_schema/validators.py:40 -#: rhodecode/model/validation_schema/validators.py:53 +#: rhodecode/model/validators.py:946 +#: rhodecode/model/validation_schema/validators.py:41 +#: rhodecode/model/validation_schema/validators.py:54 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:967 +#: rhodecode/model/validators.py:947 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:994 +#: rhodecode/model/validators.py:975 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: rhodecode/model/validators.py:1009 +#: rhodecode/model/validators.py:992 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: rhodecode/model/validators.py:1012 +#: rhodecode/model/validators.py:995 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "" -#: rhodecode/model/validators.py:1015 +#: rhodecode/model/validators.py:998 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validators.py:1017 +#: rhodecode/model/validators.py:1000 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validation_schema/validators.py:61 +#: rhodecode/model/validators.py:1068 +msgid "Url must start with http or /" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:62 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:70 +#: rhodecode/model/validation_schema/validators.py:71 msgid "Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/validators.py:132 +#: rhodecode/model/validation_schema/validators.py:133 msgid "" "Invalid clone url, provide a valid clone url starting with one of " "{allowed_prefixes}" msgstr "" -#: rhodecode/model/validation_schema/validators.py:138 +#: rhodecode/model/validation_schema/validators.py:139 msgid "invalid clone url for {repo_type} repository" msgstr "" +#: rhodecode/model/validation_schema/validators.py:148 +msgid "Please enter a valid json object" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -4074,35 +4079,35 @@ msgstr "" msgid "Integration scope" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 msgid "General integration options" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 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:113 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: 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:136 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4142,451 +4147,451 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: 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/rhodecode-components.js:28706 +#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: 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/rhodecode-components.js:30637 +#: rhodecode/public/js/scripts.js:22485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: 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/rhodecode-components.js:30638 +#: rhodecode/public/js/scripts.js:22486 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: 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/rhodecode-components.js:30639 +#: rhodecode/public/js/scripts.js:22487 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: 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/rhodecode-components.js:30640 +#: rhodecode/public/js/scripts.js:22488 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: 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/rhodecode-components.js:30641 +#: rhodecode/public/js/scripts.js:22489 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: 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/rhodecode-components.js:30642 +#: rhodecode/public/js/scripts.js:22490 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: 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/rhodecode-components.js:30662 +#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: 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/rhodecode-components.js:30670 +#: rhodecode/public/js/scripts.js:22518 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: 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/rhodecode-components.js:30682 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: 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/rhodecode-components.js:30684 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: 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/rhodecode-components.js:30688 +#: rhodecode/public/js/scripts.js:22536 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: 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/rhodecode-components.js:30690 +#: rhodecode/public/js/scripts.js:22538 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: 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/rhodecode-components.js:30692 +#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: 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-components.js:44751 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: 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-components.js:44754 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: 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-components.js:44757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "Keine Treffer gefunden" -#: 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-components.js:44760 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: 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-components.js:44764 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: 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:43213 -#: rhodecode/public/js/scripts.js:35061 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:44766 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: 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:43218 -#: rhodecode/public/js/scripts.js:35066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:44771 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: 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:43220 -#: rhodecode/public/js/scripts.js:35068 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:44773 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: 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:43225 -#: rhodecode/public/js/scripts.js:35073 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:44778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: 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:43227 -#: rhodecode/public/js/scripts.js:35075 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 +#: rhodecode/public/js/rhodecode-components.js:44780 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: 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:43231 -#: rhodecode/public/js/scripts.js:35079 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode-components.js:44784 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: 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-components.js:44786 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: 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/rhodecode-components.js:45724 +#: rhodecode/public/js/scripts.js:37528 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: 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/rhodecode-components.js:45726 +#: rhodecode/public/js/scripts.js:37530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: 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/rhodecode-components.js:46172 +#: rhodecode/public/js/scripts.js:37976 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: 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/rhodecode-components.js:46191 +#: rhodecode/public/js/scripts.js:37995 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: 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/rhodecode-components.js:46210 +#: rhodecode/public/js/scripts.js:38014 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:44673 -#: rhodecode/public/js/scripts.js:36521 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:46230 +#: rhodecode/public/js/scripts.js:38034 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: 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/rhodecode-components.js:46597 +#: rhodecode/public/js/scripts.js:38401 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: 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/rhodecode-components.js:46681 +#: rhodecode/public/js/scripts.js:38485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: 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/rhodecode-components.js:46696 +#: rhodecode/public/js/scripts.js:38500 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: 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:45296 -#: rhodecode/public/js/scripts.js:37144 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:46853 +#: rhodecode/public/js/scripts.js:38657 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "" -#: 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/rhodecode-components.js:46904 +#: rhodecode/public/js/scripts.js:38708 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: 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:45452 -#: rhodecode/public/js/scripts.js:37300 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:538 +#: rhodecode/public/js/rhodecode-components.js:47014 +#: rhodecode/public/js/scripts.js:38818 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/comments.js:543 msgid "Delete this comment?" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47084 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:613 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47161 +#: rhodecode/public/js/scripts.js:38965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode/comments.js:690 msgid "Leave a comment on line {0}." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47275 +#: rhodecode/public/js/scripts.js:39079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/comments.js:804 msgid "TODO from comment {0} was fixed." msgstr "" -#: 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/rhodecode-components.js:47455 +#: rhodecode/public/js/scripts.js:39259 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: 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/rhodecode-components.js:47457 +#: rhodecode/public/js/scripts.js:39261 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: 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/rhodecode-components.js:47466 +#: rhodecode/public/js/scripts.js:39270 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: 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/rhodecode-components.js:47601 +#: rhodecode/public/js/scripts.js:39405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: 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/rhodecode-components.js:47641 +#: rhodecode/public/js/scripts.js:39445 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: 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/rhodecode-components.js:47642 +#: rhodecode/public/js/scripts.js:39446 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: 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/rhodecode-components.js:47651 +#: rhodecode/public/js/scripts.js:39455 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: 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/rhodecode-components.js:47652 +#: rhodecode/public/js/scripts.js:39456 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: 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/rhodecode-components.js:48032 +#: rhodecode/public/js/scripts.js:39836 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: 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:46510 -#: rhodecode/public/js/scripts.js:38358 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:48041 +#: rhodecode/public/js/scripts.js:39845 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48046 +#: rhodecode/public/js/scripts.js:39850 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: 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/rhodecode-components.js:48052 +#: rhodecode/public/js/scripts.js:39856 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48068 +#: rhodecode/public/js/scripts.js:39872 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46530 -#: rhodecode/public/js/scripts.js:38378 +#: rhodecode/public/js/rhodecode-components.js:48075 +#: rhodecode/public/js/scripts.js:39879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48082 +#: rhodecode/public/js/scripts.js:39886 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48096 +#: rhodecode/public/js/scripts.js:39900 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48198 +#: rhodecode/public/js/scripts.js:40002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:300 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46823 -#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode-components.js:48204 +#: rhodecode/public/js/scripts.js:40008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +msgid "User `{0}` already in reviewers" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48334 +#: rhodecode/public/js/scripts.js:40138 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:436 msgid "added manually by \"{0}\"" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48338 +#: rhodecode/public/js/scripts.js:40142 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:440 msgid "member of \"{0}\"" msgstr "" -#: 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/rhodecode-components.js:48924 +#: rhodecode/public/js/scripts.js:40728 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: 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/rhodecode-components.js:48944 +#: rhodecode/public/js/scripts.js:40748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: 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 +#: rhodecode/public/js/rhodecode-components.js:49356 +#: rhodecode/public/js/scripts.js:41160 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode.js:574 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 +#: rhodecode/public/js/rhodecode-components.js:49364 +#: rhodecode/public/js/scripts.js:41168 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/src/rhodecode.js:582 msgid "Specified expiration date" msgstr "" @@ -4595,174 +4600,180 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:488 -#: rhodecode/templates/codeblocks/diffs.mako:493 +#: rhodecode/templates/codeblocks/diffs.mako:494 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Add another comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 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/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No branches available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No forks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No gists available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No repositories available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No repository groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 msgid "No ssh keys available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 msgid "No tags available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 msgid "No user groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No users available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/templates/changelog/changelog.mako:59 msgid "Open new pull request" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: 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:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 msgid "{0} out of {1} ssh keys" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 msgid "{0} years" msgstr "" @@ -4836,12 +4847,17 @@ msgstr "" msgid "Edit Repository Group" msgstr "" -#: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:68 +msgid "No repositories or repositories groups exists here." +msgstr "" + +#: rhodecode/templates/index_base.mako:86 +#: rhodecode/templates/index_base.mako:116 #: rhodecode/templates/admin/gists/index.mako:112 #: 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_user_group_membership.mako:39 #: 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 @@ -4858,13 +4874,14 @@ msgstr "" msgid "Name" msgstr "Name" -#: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/index_base.mako:89 +#: rhodecode/templates/index_base.mako:119 #: 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/my_account/my_account_user_group_membership.mako:44 #: 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:55 @@ -4894,20 +4911,21 @@ msgstr "Name" #: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 -#: rhodecode/templates/summary/components.mako:82 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "Beschreibung" -#: rhodecode/templates/index_base.mako:103 -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:92 +#: rhodecode/templates/index_base.mako:122 #: 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/index_base.mako:94 +#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 @@ -4919,11 +4937,11 @@ msgstr "Letzte Änderung" #: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:68 -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:209 msgid "Owner" msgstr "Besitzer" -#: rhodecode/templates/index_base.mako:134 +#: rhodecode/templates/index_base.mako:125 #: 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 @@ -4935,7 +4953,7 @@ msgstr "Besitzer" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4952,7 +4970,7 @@ msgid "Home" msgstr "" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:343 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Einloggen" @@ -4976,7 +4994,7 @@ msgstr "" #: rhodecode/templates/login.mako:68 #: rhodecode/templates/password_reset.mako:37 -#: rhodecode/templates/base/base.mako:46 +#: rhodecode/templates/base/base.mako:48 #: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "Support" @@ -5131,7 +5149,7 @@ msgid "Repository" msgstr "Repository" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:77 msgid "Admin audit logs" msgstr "" @@ -5318,7 +5336,7 @@ 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/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 @@ -5392,7 +5410,7 @@ msgstr "" #: 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:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5495,8 +5513,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: 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:249 +#: rhodecode/templates/base/base.mako:86 +#: rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "Einstellungen" @@ -5599,7 +5617,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:355 +#: rhodecode/templates/base/base.mako:357 msgid "My account" msgstr "Mein Account" @@ -5627,35 +5645,40 @@ msgstr "" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:36 -msgid "OAuth Identities" +#: rhodecode/templates/admin/my_account/my_account.mako:33 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 +msgid "User Group Membership" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:38 +msgid "OAuth Identities" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "E-Mails" -#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "Watched" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:43 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 -#: rhodecode/templates/base/base.mako:239 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:44 #: 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 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:82 msgid "Permissions" msgstr "Rechte" -#: rhodecode/templates/admin/my_account/my_account.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:45 msgid "Live Notifications" msgstr "" @@ -5881,6 +5904,23 @@ msgid "" "sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +msgid "Click add to use this generate SSH key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 +#: 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: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 +#: rhodecode/templates/admin/users/users.mako:74 +msgid "Active" +msgstr "Aktiv" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" @@ -6094,8 +6134,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:77 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:153 msgid "Repository groups" msgstr "" @@ -6284,7 +6324,7 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:196 +#: rhodecode/templates/base/base.mako:198 msgid "Clone from" msgstr "Clone von" @@ -6364,7 +6404,7 @@ msgid "Remote" msgstr "Entfernt" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:143 +#: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "Statistiken" @@ -6389,100 +6429,104 @@ msgstr "" msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Attached scoped tokens" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:25 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 msgid "Set" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40 msgid "Manually set this repository as a fork of another from the list" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:49 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 msgid "" "All actions made on this repository will be visible to everyone following " "the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "" "Force repository locking. This only works when anonymous access is disabled." " Pulling from the repository locks the repository to that user until the " "same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 #: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 msgid "" "This repository will be renamed in a special way in order to make it " "inaccessible to RhodeCode Enterprise and its VCS systems. If you need to " @@ -6490,11 +6534,11 @@ msgid "" "rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" @@ -6542,17 +6586,6 @@ msgstr "" msgid "Key" 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: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 -#: rhodecode/templates/admin/users/users.mako:74 -msgid "Active" -msgstr "Aktiv" - #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" @@ -6714,7 +6747,7 @@ msgid "Settings for Repository: %s" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 -msgid "Non-changeable id" +msgid "permalink id" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 @@ -6909,7 +6942,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:210 +#: rhodecode/templates/admin/settings/settings_visual.mako:214 msgid "Save settings" msgstr "Einstellungen speichern" @@ -7203,6 +7236,14 @@ msgstr "Suche nach Updates..." msgid "Gunicorn process management" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:11 +msgid "start auto refresh" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:12 +msgid "stop auto refresh" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -7253,13 +7294,6 @@ msgstr "" msgid "Cleanup sessions" msgstr "" -#: rhodecode/templates/admin/settings/settings_supervisor_tail.mako:1 -#, python-format -msgid "" -"Last %(size)s bytes of process logs, use ?offset=[num] GET param to set " -"custom size" -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7415,24 +7449,26 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:170 -msgid "Clone URL" +msgid "Clone URL templates" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:179 +#: rhodecode/templates/admin/settings/settings_visual.mako:181 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" " {user} current user username,\n" +" {sys_user} current system user running this process, usefull for ssh,\n" +" {hostname} hostname of this server running RhodeCode,\n" " {netloc} network location/server host of running RhodeCode server,\n" " {repo} full repository name,\n" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:192 +#: rhodecode/templates/admin/settings/settings_visual.mako:196 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:200 +#: rhodecode/templates/admin/settings/settings_visual.mako:204 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7447,8 +7483,8 @@ msgstr "Benutzergruppe hinzufügen" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:79 -#: rhodecode/templates/base/base.mako:154 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:156 msgid "User groups" msgstr "Benutzergruppen" @@ -7596,7 +7632,7 @@ msgstr "Benutzer hinzufügen" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:80 msgid "Users" msgstr "Benutzer" @@ -7860,13 +7896,17 @@ msgstr "" msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:25 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" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 +msgid "Use this generated key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +msgid "Confirmation required on the next screen" msgstr "" #: rhodecode/templates/admin/users/users.mako:5 @@ -7877,174 +7917,174 @@ msgstr "Benutzerverwaltung" msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:53 +#: rhodecode/templates/base/base.mako:55 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:83 msgid "Authentication" msgstr "Authentifizierung" -#: rhodecode/templates/base/base.mako:83 +#: rhodecode/templates/base/base.mako:85 msgid "Defaults" msgstr "Standards" -#: rhodecode/templates/base/base.mako:101 +#: rhodecode/templates/base/base.mako:103 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:188 +#: rhodecode/templates/base/base.mako:190 msgid "Fork of" msgstr "" -#: rhodecode/templates/base/base.mako:205 +#: rhodecode/templates/base/base.mako:207 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:210 +#: rhodecode/templates/base/base.mako:212 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:228 +#: rhodecode/templates/base/base.mako:230 #: 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/base/base.mako:231 #: 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/base/base.mako:232 #: 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:231 +#: rhodecode/templates/base/base.mako:233 #: 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:235 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Zeige Pullrequests für %s" -#: rhodecode/templates/base/base.mako:245 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Optionen" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: 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/base/base.mako:269 +#: rhodecode/templates/base/base.mako:413 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Suche" -#: rhodecode/templates/base/base.mako:271 +#: rhodecode/templates/base/base.mako:273 msgid "Unlock" msgstr "Entsperren" -#: rhodecode/templates/base/base.mako:273 +#: rhodecode/templates/base/base.mako:275 msgid "Lock" msgstr "Sperren" -#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/base/base.mako:280 #: 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:279 +#: rhodecode/templates/base/base.mako:281 msgid "Create Pull Request" msgstr "Pullrequest erstellen" -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:303 msgid "Sign in" msgstr "Anmelden" -#: rhodecode/templates/base/base.mako:309 +#: rhodecode/templates/base/base.mako:311 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/base/base.mako:328 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "(Kennwort vergessen?)" -#: rhodecode/templates/base/base.mako:336 +#: rhodecode/templates/base/base.mako:338 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:338 +#: rhodecode/templates/base/base.mako:340 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:357 +#: rhodecode/templates/base/base.mako:359 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:361 +#: rhodecode/templates/base/base.mako:363 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:393 +#: rhodecode/templates/base/base.mako:395 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:396 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:15 msgid "Journal" msgstr "Logbuch" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:401 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:402 msgid "Public journal" msgstr "Öffentliches Logbuch" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:407 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:408 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:412 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/base/base.mako:418 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:433 -#: rhodecode/templates/base/base.mako:434 +#: rhodecode/templates/base/base.mako:435 +#: rhodecode/templates/base/base.mako:436 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8066,15 +8106,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:491 +#: rhodecode/templates/base/base.mako:493 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:546 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:554 msgid "Site-wide shortcuts" msgstr "" @@ -8181,8 +8221,8 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:274 -#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:325 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8527,10 +8567,10 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changelog/changelog_elements.mako:121 #: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 -#: rhodecode/templates/summary/summary_commits.mako:62 +#: rhodecode/templates/summary/summary_commits.mako:68 #, python-format msgid "Bookmark %s" msgstr "" @@ -8549,10 +8589,10 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changelog/changelog_elements.mako:113 #: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 -#: rhodecode/templates/summary/summary_commits.mako:76 +#: rhodecode/templates/summary/summary_commits.mako:82 #, python-format msgid "Branch %s" msgstr "" @@ -8617,79 +8657,79 @@ msgstr "" msgid "load previous" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/summary/summary_commits.mako:21 +#: rhodecode/templates/changelog/changelog_elements.mako:32 +#: rhodecode/templates/summary/summary_commits.mako:27 #, python-format msgid "" "Commit status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/summary/summary_commits.mako:25 +#: rhodecode/templates/changelog/changelog_elements.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: {}" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/summary/summary_commits.mako:31 +#: rhodecode/templates/changelog/changelog_elements.mako:42 +#: rhodecode/templates/summary/summary_commits.mako:37 msgid "Commit status: Not Reviewed" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/summary/summary_commits.mako:36 +#: rhodecode/templates/changelog/changelog_elements.mako:47 +#: rhodecode/templates/summary/summary_commits.mako:42 msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changelog/changelog_elements.mako:58 #: rhodecode/templates/changeset/changeset.mako:42 msgid "Copy the full commit id" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changelog/changelog_elements.mako:65 #: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:72 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: rhodecode/templates/changeset/changeset.mako:50 #: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:72 #: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: 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/changelog/changelog_elements.mako:83 +#: rhodecode/templates/compare/compare_commits.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changelog/changelog_elements.mako:107 #: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 -#: rhodecode/templates/summary/summary_commits.mako:69 +#: rhodecode/templates/summary/summary_commits.mako:75 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:137 +#: rhodecode/templates/changelog/changelog_elements.mako:143 msgid "load next" msgstr "" @@ -8724,7 +8764,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:81 +#: rhodecode/templates/changeset/changeset_file_comment.mako:82 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8740,8 +8780,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:445 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:451 +#: rhodecode/templates/codeblocks/diffs.mako:454 msgid "Raw diff" msgstr "" @@ -8758,8 +8798,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:452 -#: rhodecode/templates/codeblocks/diffs.mako:455 +#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:461 msgid "Download diff" msgstr "" @@ -8783,103 +8823,103 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:32 +#: rhodecode/templates/changeset/changeset_file_comment.mako:33 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:39 +#: rhodecode/templates/changeset/changeset_file_comment.mako:40 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:66 -#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:67 +#: rhodecode/templates/changeset/changeset_file_comment.mako:69 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:73 +#: rhodecode/templates/changeset/changeset_file_comment.mako:74 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:88 +#: rhodecode/templates/changeset/changeset_file_comment.mako:89 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 msgid "Pull request author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +#: rhodecode/templates/changeset/changeset_file_comment.mako:98 msgid "author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:105 +#: rhodecode/templates/changeset/changeset_file_comment.mako:106 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:109 -#: rhodecode/templates/changeset/changeset_file_comment.mako:124 +#: rhodecode/templates/changeset/changeset_file_comment.mako:110 +#: rhodecode/templates/changeset/changeset_file_comment.mako:125 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:121 +#: rhodecode/templates/changeset/changeset_file_comment.mako:122 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:151 -#: rhodecode/templates/changeset/changeset_file_comment.mako:154 -msgid "Prev" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:152 #: rhodecode/templates/changeset/changeset_file_comment.mako:155 +msgid "Prev" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:153 +#: rhodecode/templates/changeset/changeset_file_comment.mako:156 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:191 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:193 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:195 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: 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:65 +msgid "You need to be logged in to leave comments." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:348 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "" "Use @username inside this text to send notification to this RhodeCode user" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 +#: rhodecode/templates/changeset/changeset_file_comment.mako:352 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:368 +#: rhodecode/templates/changeset/changeset_file_comment.mako:369 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:398 +#: rhodecode/templates/changeset/changeset_file_comment.mako:399 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8976,71 +9016,71 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:290 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/codeblocks/diffs.mako:356 #: 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 +#: rhodecode/templates/codeblocks/diffs.mako:421 +#: rhodecode/templates/codeblocks/diffs.mako:437 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:417 -#: rhodecode/templates/codeblocks/diffs.mako:424 +#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:430 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:422 -#: rhodecode/templates/codeblocks/diffs.mako:438 +#: rhodecode/templates/codeblocks/diffs.mako:428 +#: rhodecode/templates/codeblocks/diffs.mako:444 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:433 -#: rhodecode/templates/codeblocks/diffs.mako:440 +#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:446 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:643 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:651 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:649 +#: rhodecode/templates/codeblocks/diffs.mako:655 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:650 +#: rhodecode/templates/codeblocks/diffs.mako:656 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:660 +#: rhodecode/templates/codeblocks/diffs.mako:666 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:664 +#: rhodecode/templates/codeblocks/diffs.mako:670 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:668 +#: rhodecode/templates/codeblocks/diffs.mako:674 msgid "Wide Mode Diff" msgstr "" @@ -9057,11 +9097,11 @@ msgid "Compare was calculated based on this shared commit." msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:78 msgid "No commits in this compare" msgstr "" @@ -9632,7 +9672,7 @@ msgid "Close File List" msgstr "" #: rhodecode/templates/files/files_browser.mako:25 -#: rhodecode/templates/summary/summary_commits.mako:103 +#: rhodecode/templates/summary/summary_commits.mako:109 msgid "Add New File" msgstr "" @@ -9908,12 +9948,12 @@ msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 msgid "Add reviewer or reviewer group" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:504 +#: rhodecode/templates/pullrequests/pullrequest.mako:508 msgid "Please select source and target" msgstr "" @@ -9921,19 +9961,19 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:364 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:368 +#: rhodecode/templates/pullrequests/pullrequest.mako:371 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:431 +#: rhodecode/templates/pullrequests/pullrequest.mako:435 msgid "Target repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:441 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Select commit reference" msgstr "" @@ -9994,8 +10034,7 @@ msgid "Merge" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:140 -#: rhodecode/templates/summary/components.mako:53 -#: rhodecode/templates/summary/components.mako:69 +#: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" @@ -10075,85 +10114,81 @@ msgid "Pull request versions not available" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 -msgid "Mandatory reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 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:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 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:431 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 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:442 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 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:482 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:593 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:596 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 msgid "show them" msgstr "" @@ -10264,74 +10299,59 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/components.mako:49 -msgid "Read-only url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -#: rhodecode/templates/summary/components.mako:72 +#: rhodecode/templates/summary/components.mako:71 msgid "Copy the clone by id url" msgstr "" -#: rhodecode/templates/summary/components.mako:58 -#: rhodecode/templates/summary/components.mako:74 -msgid "Show by Name" +#: rhodecode/templates/summary/components.mako:76 +msgid "Copy the clone by ssh url" msgstr "" -#: rhodecode/templates/summary/components.mako:59 -#: rhodecode/templates/summary/components.mako:75 -msgid "Show by ID" -msgstr "" - -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:65 -msgid "Clone url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:94 +#: rhodecode/templates/summary/components.mako:100 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:110 +#: rhodecode/templates/summary/components.mako:116 msgid "Number of Repository Forks" msgstr "" -#: rhodecode/templates/summary/components.mako:118 +#: rhodecode/templates/summary/components.mako:124 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:149 +#: rhodecode/templates/summary/components.mako:155 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:153 +#: rhodecode/templates/summary/components.mako:159 msgid "Statistics are disabled for this repository" msgstr "Die Statistik ist für dieses Repository deaktiviert" -#: rhodecode/templates/summary/components.mako:156 +#: rhodecode/templates/summary/components.mako:162 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:167 +#: rhodecode/templates/summary/components.mako:173 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:173 +#: rhodecode/templates/summary/components.mako:179 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/components.mako:177 +#: rhodecode/templates/summary/components.mako:183 msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/components.mako:180 +#: rhodecode/templates/summary/components.mako:186 msgid "enable downloads" msgstr "" @@ -10364,15 +10384,15 @@ msgstr "" msgid "%s RSS feed" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:100 +#: rhodecode/templates/summary/summary_commits.mako:106 msgid "Add or upload files directly via RhodeCode:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:111 +#: rhodecode/templates/summary/summary_commits.mako:117 msgid "Push new repo:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:128 msgid "Existing repository?" msgstr "" @@ -10400,9 +10420,3 @@ msgstr "" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" msgstr "" - -#: rhodecode/tests/lib/test_ext_json.py:163 -msgid "singular" -msgid_plural "plural" -msgstr[0] "" -msgstr[1] "" diff --git a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo index 67fd2a86..71177dea 100644 Binary files a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo and b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo differ diff --git a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po index 91a9dbed..16989149 100644 --- a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po @@ -1,5 +1,5 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2017 RhodeCode GmbH +# Copyright (C) 2018 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-11-03 16:42+0100\n" -"PO-Revision-Date: 2017-11-03 15:43+0000\n" +"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"PO-Revision-Date: 2018-01-30 16:33+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Spanish (http://www.transifex.com/rhodecode/RhodeCode/language/es/)\n" "MIME-Version: 1.0\n" @@ -19,32 +19,53 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/apps/_base/__init__.py:142 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "Error al crear repositorio %s: certificado inválido" + +#: rhodecode/apps/_base/__init__.py:146 +#, python-format +msgid "Error creating repository %s" +msgstr "Error al crear repositorio %s" + +#: rhodecode/apps/_base/__init__.py:219 +#, python-format +msgid "" +"The repository `%(repo_name)s` cannot be loaded in filesystem. Please check " +"if it exist, or is not damaged." +msgstr "" + +#: rhodecode/apps/_base/__init__.py:274 +msgid "Editing user `{}` is disabled." +msgstr "" + +#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/apps/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:74 #: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "" -#: rhodecode/apps/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:76 msgid "Visual" msgstr "" -#: rhodecode/apps/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:78 msgid "Remap and Rescan" msgstr "" -#: rhodecode/apps/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:80 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "" -#: rhodecode/apps/admin/navigation.py:89 -#: rhodecode/integrations/types/email.py:232 +#: rhodecode/apps/admin/navigation.py:82 +#: rhodecode/integrations/types/email.py:233 #: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 @@ -56,15 +77,15 @@ msgstr "" msgid "Email" msgstr "" -#: rhodecode/apps/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:84 msgid "Hooks" msgstr "" -#: rhodecode/apps/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:86 msgid "Full Text Search" msgstr "" -#: rhodecode/apps/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:88 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -78,28 +99,28 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 #: rhodecode/templates/admin/repos/repo_edit.mako:75 -#: rhodecode/templates/base/base.mako:82 +#: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "" -#: rhodecode/apps/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:90 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "" -#: rhodecode/apps/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:92 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:94 msgid "User Sessions" msgstr "" -#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/apps/admin/navigation.py:96 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:109 +#: rhodecode/apps/admin/navigation.py:101 msgid "Labs" msgstr "" @@ -111,13 +132,13 @@ msgstr "Ajustes por defecto actualizados exitosamente" 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 +#: rhodecode/apps/admin/views/permissions.py:120 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:141 #: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:287 +#: rhodecode/apps/admin/views/permissions.py:288 msgid "Error occurred during update of permissions" msgstr "Error ocurrido durante actualización de permisos" @@ -125,11 +146,11 @@ msgstr "Error ocurrido durante actualización de permisos" msgid "Object permissions updated successfully" msgstr "Permisos de objeto actualizados exitosamente" -#: rhodecode/apps/admin/views/permissions.py:267 +#: rhodecode/apps/admin/views/permissions.py:268 msgid "Global permissions updated successfully" msgstr "Permisos globales actualizado exitosamente" -#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/apps/admin/views/permissions.py:450 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:208 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -150,20 +171,20 @@ msgstr "Permisos globales actualizado exitosamente" msgid "Edit" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:476 +#: rhodecode/apps/admin/views/permissions.py:478 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:479 +#: rhodecode/apps/admin/views/permissions.py:481 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:180 +#: rhodecode/apps/admin/views/repo_groups.py:181 #, python-format msgid "Created repository group %s" msgstr "Se creó grupo de repositorio %s" -#: rhodecode/apps/admin/views/repo_groups.py:198 +#: rhodecode/apps/admin/views/repo_groups.py:199 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Error ocurrido durante creación de grupo de repositorio %s" @@ -172,10 +193,86 @@ msgstr "Error ocurrido durante creación de grupo de repositorio %s" msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/apps/admin/views/sessions.py:98 +#: rhodecode/apps/admin/views/sessions.py:97 msgid "Failed to cleanup up old sessions" msgstr "" +#: rhodecode/apps/admin/views/settings.py:162 +#: rhodecode/apps/admin/views/settings.py:708 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +msgid "Some form inputs contain invalid data." +msgstr "Algunos campos de entrada contienen datos inválidos" + +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:351 +msgid "Error occurred during updating application settings" +msgstr "Error ocurrido durante actualización de ajustes de aplicación" + +#: rhodecode/apps/admin/views/settings.py:194 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +msgid "Updated VCS settings" +msgstr "Se actualizaron ajustes VCS" + +#: rhodecode/apps/admin/views/settings.py:268 +#, python-format +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "Repositorios reescaneados exitosamente agregados: %s ; eliminados: %s" + +#: rhodecode/apps/admin/views/settings.py:347 +msgid "Updated application settings" +msgstr "Se actualizaron los ajustes de aplicación" + +#: rhodecode/apps/admin/views/settings.py:426 +msgid "Updated visualisation settings" +msgstr "Se actualizaron los ajustes de visualización" + +#: rhodecode/apps/admin/views/settings.py:429 +msgid "Error occurred during updating visualisation settings" +msgstr "Error ocurrido al actualizar ajustes de visualización" + +#: rhodecode/apps/admin/views/settings.py:491 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +msgid "Invalid issue tracker pattern: {}" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:508 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +msgid "Updated issue tracker entries" +msgstr "Se actualizaron entradas en el seguidor de incidencias" + +#: rhodecode/apps/admin/views/settings.py:526 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 +msgid "Removed issue tracker entry" +msgstr "Se eliminó entrada en el seguidor de incidencias" + +#: rhodecode/apps/admin/views/settings.py:563 +msgid "Please enter email address" +msgstr "Por favor ingrese una dirección de correo electrónico" + +#: rhodecode/apps/admin/views/settings.py:581 +msgid "Send email task created" +msgstr "Tarea de envío de correo electrónico creada" + +#: rhodecode/apps/admin/views/settings.py:631 +msgid "Added new hook" +msgstr "Se agregó nuevo gancho" + +#: rhodecode/apps/admin/views/settings.py:646 +msgid "Updated hooks" +msgstr "Se actualizaron ganchos" + +#: rhodecode/apps/admin/views/settings.py:650 +msgid "Error occurred during hook creation" +msgstr "Error ocurrido durante creación de gancho" + +#: rhodecode/apps/admin/views/settings.py:732 +msgid "Error occurred during updating labs settings" +msgstr "Error ocurrido al actiualizar ajustes de laboratorios" + +#: rhodecode/apps/admin/views/settings.py:737 +msgid "Updated Labs settings" +msgstr "Se Actualizaron Ajustes de Laboratorios" + #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" @@ -184,149 +281,153 @@ msgstr "" msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/apps/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:79 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:102 +#: rhodecode/apps/admin/views/system_info.py:90 msgid "Update info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:104 +#: rhodecode/apps/admin/views/system_info.py:92 msgid "Check for updates" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:97 msgid "RhodeCode Version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:110 +#: rhodecode/apps/admin/views/system_info.py:98 +msgid "Latest version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:99 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:111 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:112 +#: rhodecode/apps/admin/views/system_info.py:101 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "RhodeCode Certificate" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:103 msgid "Workers" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:115 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Worker Type" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "Database" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:109 msgid "Database version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:124 +#: rhodecode/apps/admin/views/system_info.py:113 msgid "Platform" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Platform UUID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Python version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:116 msgid "Python path" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:131 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "CPU" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Load" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Memory" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:123 msgid "Uptime" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Storage inodes" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "Gist storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Gist storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Archive cache storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:148 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Temp storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:149 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Temp storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Search info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Search location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:156 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "VCS Backends" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:157 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "VCS Server" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:158 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "GIT" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:159 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "HG" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:160 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "SVN" msgstr "" @@ -340,188 +441,188 @@ msgstr "Se creó grupo de usuario %(user_group_link)s" 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 +#: rhodecode/apps/admin/views/users.py:209 #, python-format msgid "Created user %(user_link)s" msgstr "Se creó usuario %(user_link)s" -#: rhodecode/apps/admin/views/users.py:229 +#: rhodecode/apps/admin/views/users.py:230 #, 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 +#: rhodecode/apps/admin/views/users.py:304 msgid "User updated successfully" msgstr "Usuario actualizado exitosamente" -#: rhodecode/apps/admin/views/users.py:321 -#: rhodecode/apps/my_account/views/my_account.py:485 +#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/my_account/views/my_account.py:490 #, 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 +#: rhodecode/apps/admin/views/users.py:354 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:358 +#: rhodecode/apps/admin/views/users.py:359 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:366 +#: rhodecode/apps/admin/views/users.py:367 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:371 +#: rhodecode/apps/admin/views/users.py:372 #, python-format msgid "Deleted %s repository groups" msgstr "Se elminaron %s grupos de repositorio" -#: rhodecode/apps/admin/views/users.py:379 +#: rhodecode/apps/admin/views/users.py:380 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:384 +#: rhodecode/apps/admin/views/users.py:385 #, python-format msgid "Deleted %s user groups" msgstr "Se eliminaron %s grupos de usuario" -#: rhodecode/apps/admin/views/users.py:401 +#: rhodecode/apps/admin/views/users.py:402 msgid "Successfully deleted user" msgstr "Se eliminó usuario exitosamente" -#: rhodecode/apps/admin/views/users.py:407 +#: rhodecode/apps/admin/views/users.py:408 msgid "An error occurred during deletion of user" msgstr "Ocurrió un error durante eliminación de usuario" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:473 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 +#: rhodecode/apps/admin/views/users.py:479 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 +#: rhodecode/apps/admin/views/users.py:567 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 +#: rhodecode/apps/admin/views/users.py:585 +#: rhodecode/apps/user_group/views/__init__.py:448 msgid "An error occurred during permissions saving" msgstr "Ocurrió un error al guardar permisos" -#: rhodecode/apps/admin/views/users.py:608 +#: rhodecode/apps/admin/views/users.py:610 msgid "Force password change disabled for user" msgstr "Forzar cambio de contraseña deshabilitado para usuario" -#: rhodecode/apps/admin/views/users.py:613 +#: rhodecode/apps/admin/views/users.py:615 msgid "Force password change enabled for user" msgstr "Forzar cambio de contraseña habilitado para usuario" -#: rhodecode/apps/admin/views/users.py:622 +#: rhodecode/apps/admin/views/users.py:624 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 +#: rhodecode/apps/admin/views/users.py:663 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:667 +#: rhodecode/apps/admin/views/users.py:669 #, python-format msgid "Created repository group `%s`" msgstr "Se creó grupo de repositorio `%s`" -#: rhodecode/apps/admin/views/users.py:671 +#: rhodecode/apps/admin/views/users.py:673 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:676 +#: rhodecode/apps/admin/views/users.py:678 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/apps/admin/views/users.py:701 +#: rhodecode/apps/my_account/views/my_account.py:160 #: 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:737 -#: rhodecode/apps/my_account/views/my_account.py:193 +#: rhodecode/apps/admin/views/users.py:739 +#: rhodecode/apps/my_account/views/my_account.py:194 msgid "Auth token successfully created" msgstr "Ficha de autenticación creada exitosamente" -#: rhodecode/apps/admin/views/users.py:766 -#: rhodecode/apps/my_account/views/my_account.py:217 +#: rhodecode/apps/admin/views/users.py:768 +#: rhodecode/apps/my_account/views/my_account.py:218 msgid "Auth token successfully deleted" msgstr "Ficha de autenticación eliminada exitosamente" -#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/admin/views/users.py:840 #: 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/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:849 #: 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/admin/views/users.py:883 #: 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 +#: rhodecode/apps/admin/views/users.py:929 +#: rhodecode/apps/my_account/views/my_account.py:260 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:928 +#: rhodecode/apps/admin/views/users.py:935 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 +#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/my_account/views/my_account.py:266 msgid "An error occurred during email saving" msgstr "Ocurrió un error durante guardado de correo electrónico" -#: rhodecode/apps/admin/views/users.py:959 +#: rhodecode/apps/admin/views/users.py:966 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1005 +#: rhodecode/apps/admin/views/users.py:1012 #, python-format msgid "An error occurred during ip saving:%s" msgstr "Ocurrió un error al guardar ip:%s" -#: rhodecode/apps/admin/views/users.py:1023 +#: rhodecode/apps/admin/views/users.py:1034 msgid "An error occurred during ip saving" msgstr "Ocurrió un error al guardar ip" -#: rhodecode/apps/admin/views/users.py:1027 +#: rhodecode/apps/admin/views/users.py:1038 #, 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:1057 +#: rhodecode/apps/admin/views/users.py:1068 msgid "Removed ip address from user whitelist" msgstr "Se eliminó dirección ip de lista blanca de usuario" -#: rhodecode/apps/admin/views/users.py:1122 +#: rhodecode/apps/admin/views/users.py:1133 msgid "Groups successfully changed" msgstr "" @@ -546,10 +647,10 @@ 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 +#: rhodecode/public/js/rhodecode-components.js:49320 +#: rhodecode/public/js/scripts.js:41124 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/src/rhodecode.js:538 msgid "Lifetime" msgstr "De por vida" @@ -600,75 +701,75 @@ msgstr "" 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/apps/home/views.py:218 rhodecode/apps/home/views.py:251 +#: rhodecode/apps/repository/views/repo_pull_requests.py:719 +#: rhodecode/templates/admin/my_account/my_account.mako:41 #: 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:580 +#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:150 +#: rhodecode/templates/base/base.mako:582 msgid "Repositories" msgstr "Repositorios" -#: rhodecode/apps/home/views.py:241 +#: rhodecode/apps/home/views.py:244 msgid "Groups" msgstr "Grupos" -#: rhodecode/apps/home/views.py:261 +#: rhodecode/apps/home/views.py:264 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "diario público" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 msgid "journal" msgstr "diario" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:281 +#: rhodecode/apps/login/views.py:288 msgid "You have successfully registered with RhodeCode" msgstr "Se ha registrado exitosamente con RhodeCode" -#: rhodecode/apps/login/views.py:317 +#: rhodecode/apps/login/views.py:325 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:323 +#: rhodecode/apps/login/views.py:331 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:412 +#: rhodecode/apps/login/views.py:420 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:428 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/my_account.py:134 +#: rhodecode/apps/my_account/views/my_account.py:135 msgid "Error occurred during update of user password" msgstr "Error ocurrido durante actualización de contraseña de usuario" -#: rhodecode/apps/my_account/views/my_account.py:141 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "Contraseña actualizada exitosamente" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:288 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:465 +#: rhodecode/apps/my_account/views/my_account.py:470 msgid "Your account was updated successfully" msgstr "Su cuenta fue actualizada exitosamente" @@ -683,7 +784,7 @@ 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 +#: rhodecode/apps/user_group/views/__init__.py:328 msgid "Cannot change permission for yourself as admin" msgstr "No puede cambiar el permiso para usted como admin" @@ -710,28 +811,28 @@ msgstr "Ocurrió un error durante invalidación de caché" #: 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:585 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_commits.py:192 #: 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 +#: rhodecode/apps/repository/views/repo_checks.py:98 #, 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 +#: rhodecode/apps/repository/views/repo_checks.py:107 #, python-format msgid "Forked repository %s as %s" msgstr "Se bifurcó repositorio %s como %s" -#: rhodecode/apps/repository/views/repo_checks.py:107 +#: rhodecode/apps/repository/views/repo_checks.py:110 #, python-format msgid "Created repository %s" msgstr "Se creó repositorio %s" @@ -760,13 +861,13 @@ msgstr "Incrementar contexto" 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 +#: rhodecode/apps/repository/views/repo_commits.py:388 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1129 #, 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 +#: rhodecode/apps/repository/views/repo_commits.py:432 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -848,14 +949,14 @@ 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/apps/repository/views/repo_summary.py:322 +#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 #: 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 +#: rhodecode/model/scm.py:804 rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "Etiquetas" @@ -916,12 +1017,12 @@ msgid "" "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 +#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "" -#: rhodecode/apps/repository/views/repo_forks.py:250 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocurrió un error durante bifurcación de repositorio %s" @@ -930,91 +1031,88 @@ msgstr "Ocurrió un error durante bifurcación de repositorio %s" msgid "Repository permissions updated" msgstr "Permisos de repositorio actualizados" -#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +#: rhodecode/apps/repository/views/repo_pull_requests.py:615 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:750 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +#: rhodecode/apps/repository/views/repo_pull_requests.py:775 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +#: rhodecode/apps/repository/views/repo_pull_requests.py:790 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +#: rhodecode/apps/repository/views/repo_pull_requests.py:841 msgid "Successfully opened new pull request" msgstr "Se abrió nueva solicitud de extracción exitosamente" -#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +#: rhodecode/apps/repository/views/repo_pull_requests.py:844 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +#: rhodecode/apps/repository/views/repo_pull_requests.py:875 +#: rhodecode/apps/repository/views/repo_pull_requests.py:905 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:911 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:946 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1010 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1034 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1060 msgid "Successfully deleted pull request" msgstr "Se eliminó la solicitud de extracción exitosamente" -#: rhodecode/apps/repository/views/repo_settings.py:167 +#: rhodecode/apps/repository/views/repo_settings.py:168 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:193 +#: rhodecode/apps/repository/views/repo_settings.py:194 msgid "Unlocked" msgstr "Desbloqueado" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:199 msgid "Locked" msgstr "Bloqueado" -#: rhodecode/apps/repository/views/repo_settings.py:200 +#: rhodecode/apps/repository/views/repo_settings.py:201 #, 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.py:205 #: 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 +#: rhodecode/apps/repository/views/repo_settings.py:249 msgid "An error occurred during deletion of repository stats" msgstr "Ocurrió un error durante eliminacion de estadísticas de repositorio" @@ -1077,28 +1175,18 @@ msgstr "Repositorio blockeado" msgid "Unlocked repository" msgstr "Repositorio desbloqueado" -#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +#: rhodecode/apps/repository/views/repo_settings_fields.py:86 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 +#: rhodecode/apps/repository/views/repo_settings_fields.py:108 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 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86 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" @@ -1107,34 +1195,23 @@ msgstr "Extraído de localidad remota" 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 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Branch" msgstr "Rama" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Tag" msgstr "Etiqueta" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:299 msgid "Bookmark" msgstr "Marcador" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:323 msgid "Closed branches" msgstr "Ramas cerradas" @@ -1146,41 +1223,41 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:209 +#: rhodecode/apps/user_group/views/__init__.py:184 #, python-format msgid "Updated user group %s" msgstr "Se actualizó grupo de usuario %s" -#: rhodecode/apps/user_group/views/__init__.py:231 +#: rhodecode/apps/user_group/views/__init__.py:206 #, 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 +#: rhodecode/apps/user_group/views/__init__.py:232 msgid "Successfully deleted user group" msgstr "Grupo de usuario eliminado exitosamente" -#: rhodecode/apps/user_group/views/__init__.py:262 +#: rhodecode/apps/user_group/views/__init__.py:237 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 +#: rhodecode/apps/user_group/views/__init__.py:341 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 +#: rhodecode/apps/user_group/views/__init__.py:356 msgid "User Group permissions updated" msgstr "Permisos de grupo de usuario actualizados" -#: rhodecode/apps/user_group/views/__init__.py:452 +#: rhodecode/apps/user_group/views/__init__.py:428 msgid "User Group global permissions updated successfully" msgstr "Permisos globales para Grupo de Usuario actualizados exitosamente" -#: rhodecode/apps/user_group/views/__init__.py:534 +#: rhodecode/apps/user_group/views/__init__.py:510 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:538 +#: rhodecode/apps/user_group/views/__init__.py:514 msgid "An error occurred during synchronization update" msgstr "" @@ -1207,20 +1284,20 @@ msgstr "" msgid "Auth Cache TTL" msgstr "" -#: rhodecode/authentication/views.py:90 +#: rhodecode/authentication/views.py:93 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:170 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:181 +#: rhodecode/authentication/views.py:173 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:191 +#: rhodecode/authentication/views.py:181 msgid "Error occurred during update of auth settings." msgstr "" @@ -1345,11 +1422,11 @@ msgid "Password to authenticate for given user DN." msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 -#: rhodecode/integrations/types/webhook.py:214 +#: rhodecode/integrations/types/webhook.py:220 #: 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:324 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "" @@ -1473,56 +1550,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:286 -msgid "Error occurred during updating application settings" -msgstr "Error ocurrido durante actualización de ajustes de aplicación" - -#: rhodecode/controllers/admin/settings.py:226 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "Repositorios reescaneados exitosamente agregados: %s ; eliminados: %s" - -#: rhodecode/controllers/admin/settings.py:282 -msgid "Updated application settings" -msgstr "Se actualizaron los ajustes de aplicación" - -#: rhodecode/controllers/admin/settings.py:348 -msgid "Updated visualisation settings" -msgstr "Se actualizaron los ajustes de visualización" - -#: rhodecode/controllers/admin/settings.py:351 -msgid "Error occurred during updating visualisation settings" -msgstr "Error ocurrido al actualizar ajustes de visualización" - -#: rhodecode/controllers/admin/settings.py:444 -msgid "Please enter email address" -msgstr "Por favor ingrese una dirección de correo electrónico" - -#: rhodecode/controllers/admin/settings.py:462 -msgid "Send email task created" -msgstr "Tarea de envío de correo electrónico creada" - -#: rhodecode/controllers/admin/settings.py:495 -msgid "Added new hook" -msgstr "Se agregó nuevo gancho" - -#: rhodecode/controllers/admin/settings.py:510 -msgid "Updated hooks" -msgstr "Se actualizaron ganchos" - -#: rhodecode/controllers/admin/settings.py:514 -msgid "Error occurred during hook creation" -msgstr "Error ocurrido durante creación de gancho" - -#: rhodecode/controllers/admin/settings.py:643 -msgid "Error occurred during updating labs settings" -msgstr "Error ocurrido al actiualizar ajustes de laboratorios" - -#: rhodecode/controllers/admin/settings.py:648 -msgid "Updated Labs settings" -msgstr "Se Actualizaron Ajustes de Laboratorios" - #: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" @@ -1547,35 +1574,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:149 +#: rhodecode/events/repo.py:189 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:158 +#: rhodecode/events/repo.py:198 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:167 +#: rhodecode/events/repo.py:207 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:176 +#: rhodecode/events/repo.py:216 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:256 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:265 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:274 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:285 msgid "repository push" msgstr "" @@ -1626,7 +1653,7 @@ msgstr "" #: 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:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:215 #: 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 @@ -1654,9 +1681,9 @@ msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: 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/changeset/changeset_file_comment.mako:143 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:148 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1719,81 +1746,81 @@ msgstr "" msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:302 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:327 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:214 +#: rhodecode/integrations/types/email.py:215 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:215 +#: rhodecode/integrations/types/email.py:216 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:220 #: rhodecode/integrations/types/email.py:221 +#: rhodecode/integrations/types/email.py:222 msgid "Email address" msgstr "" -#: rhodecode/integrations/types/email.py:233 +#: rhodecode/integrations/types/email.py:234 msgid "Send repo push summaries to a list of recipients via email" msgstr "" -#: rhodecode/integrations/types/hipchat.py:43 +#: rhodecode/integrations/types/hipchat.py:41 msgid "Yellow" msgstr "" -#: rhodecode/integrations/types/hipchat.py:44 +#: rhodecode/integrations/types/hipchat.py:42 msgid "Red" msgstr "" -#: rhodecode/integrations/types/hipchat.py:45 +#: rhodecode/integrations/types/hipchat.py:43 msgid "Green" msgstr "" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Purple" msgstr "" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Gray" msgstr "" -#: rhodecode/integrations/types/hipchat.py:52 +#: rhodecode/integrations/types/hipchat.py:50 msgid "Hipchat server URL" msgstr "" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:51 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:63 +#: rhodecode/integrations/types/hipchat.py:61 msgid "Notify" msgstr "" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:62 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:70 +#: rhodecode/integrations/types/hipchat.py:68 msgid "Color" msgstr "" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:69 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:99 +#: rhodecode/integrations/types/hipchat.py:97 msgid "Hipchat" msgstr "" -#: rhodecode/integrations/types/hipchat.py:100 +#: rhodecode/integrations/types/hipchat.py:98 msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" @@ -1809,7 +1836,7 @@ msgid "" msgstr "" #: rhodecode/integrations/types/slack.py:60 -#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/integrations/types/webhook.py:210 #: 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 @@ -1820,7 +1847,7 @@ msgstr "" #: 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:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1856,11 +1883,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:177 +#: rhodecode/integrations/types/webhook.py:183 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:185 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 " @@ -1868,53 +1895,53 @@ msgid "" "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:199 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:194 +#: rhodecode/integrations/types/webhook.py:200 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 +#: rhodecode/integrations/types/webhook.py:211 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:215 +#: rhodecode/integrations/types/webhook.py:221 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:225 +#: rhodecode/integrations/types/webhook.py:231 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:226 +#: rhodecode/integrations/types/webhook.py:232 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:235 +#: rhodecode/integrations/types/webhook.py:241 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:236 +#: rhodecode/integrations/types/webhook.py:242 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:245 +#: rhodecode/integrations/types/webhook.py:251 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:246 +#: rhodecode/integrations/types/webhook.py:252 msgid "Select if the Webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:259 +#: rhodecode/integrations/types/webhook.py:265 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:260 +#: rhodecode/integrations/types/webhook.py:266 msgid "Post json events to a Webhook endpoint" msgstr "" @@ -2002,80 +2029,63 @@ msgstr "" msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/action_parser.py:171 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "Nombre de bifurcación %s" -#: rhodecode/lib/action_parser.py:189 +#: rhodecode/lib/action_parser.py:191 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "Solicitud de extracción #%s" -#: rhodecode/lib/action_parser.py:223 +#: rhodecode/lib/action_parser.py:226 #, python-format msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:228 +#: rhodecode/lib/action_parser.py:231 msgid "compare view" msgstr "comparar vista" -#: rhodecode/lib/action_parser.py:235 +#: rhodecode/lib/action_parser.py:238 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:288 +#: rhodecode/lib/action_parser.py:293 #, python-format msgid "Deleted branch: %s" msgstr "Se eliminó rama: %s" -#: rhodecode/lib/action_parser.py:291 +#: rhodecode/lib/action_parser.py:296 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/action_parser.py:304 +#: rhodecode/lib/action_parser.py:309 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1445 +#: rhodecode/lib/auth.py:1441 #, python-format msgid "IP %s not allowed" msgstr "IP %s no permitida" -#: rhodecode/lib/auth.py:1535 +#: rhodecode/lib/auth.py:1531 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:1577 +#: rhodecode/lib/auth.py:1575 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/diffs.py:62 -msgid "Click to comment" -msgstr "" - -#: rhodecode/lib/diffs.py:77 -msgid "Binary file" -msgstr "" - -#: rhodecode/lib/diffs.py:98 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: rhodecode/lib/diffs.py:109 -msgid "No changes detected" -msgstr "" - -#: rhodecode/lib/diffs.py:927 +#: rhodecode/lib/diffs.py:864 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1869 +#: rhodecode/lib/helpers.py:1855 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2095,7 +2105,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1893 +#: rhodecode/lib/helpers.py:1879 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2109,49 +2119,49 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1910 +#: rhodecode/lib/helpers.py:1896 #, 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:525 +#: rhodecode/lib/utils2.py:524 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:531 +#: rhodecode/lib/utils2.py:530 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:540 +#: rhodecode/lib/utils2.py:539 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:542 +#: rhodecode/lib/utils2.py:541 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:544 +#: rhodecode/lib/utils2.py:543 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:546 +#: rhodecode/lib/utils2.py:545 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:548 +#: rhodecode/lib/utils2.py:547 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:550 +#: rhodecode/lib/utils2.py:549 msgid "in ${val} and ${detail}" msgstr "" -#: 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/lib/utils2.py:553 +#: rhodecode/public/js/rhodecode-components.js:30702 +#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" @@ -2179,6 +2189,7 @@ msgstr "" #: 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_11_0_0.py:2599 #: 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 @@ -2187,7 +2198,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2626 msgid "Repository no access" msgstr "" @@ -2214,6 +2225,7 @@ msgstr "" #: 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_11_0_0.py:2600 #: 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 @@ -2222,7 +2234,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2627 msgid "Repository read access" msgstr "" @@ -2249,6 +2261,7 @@ msgstr "" #: 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_11_0_0.py:2601 #: 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 @@ -2257,7 +2270,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2628 msgid "Repository write access" msgstr "" @@ -2284,6 +2297,7 @@ msgstr "" #: 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_11_0_0.py:2602 #: 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 @@ -2292,7 +2306,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2629 msgid "Repository admin access" msgstr "" @@ -2359,6 +2373,7 @@ msgstr "" #: 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_11_0_0.py:2620 #: 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 @@ -2367,7 +2382,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2647 msgid "Repository creation disabled" msgstr "" @@ -2394,6 +2409,7 @@ msgstr "" #: 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_11_0_0.py:2621 #: 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 @@ -2402,7 +2418,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2648 msgid "Repository creation enabled" msgstr "" @@ -2429,6 +2445,7 @@ msgstr "" #: 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_11_0_0.py:2625 #: 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 @@ -2437,7 +2454,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2652 msgid "Repository forking disabled" msgstr "" @@ -2464,6 +2481,7 @@ msgstr "" #: 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_11_0_0.py:2626 #: 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 @@ -2472,7 +2490,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2653 msgid "Repository forking enabled" msgstr "" @@ -2520,6 +2538,7 @@ msgstr "" #: 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_11_0_0.py:3328 #: 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 @@ -2528,7 +2547,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:3355 +#: rhodecode/public/js/rhodecode-components.js:48211 +#: rhodecode/public/js/scripts.js:40015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "Not Reviewed" msgstr "" @@ -2555,6 +2578,7 @@ msgstr "" #: 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_11_0_0.py:3329 #: 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 @@ -2563,7 +2587,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:3356 msgid "Approved" msgstr "" @@ -2590,6 +2614,7 @@ msgstr "" #: 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_11_0_0.py:3330 #: 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 @@ -2598,7 +2623,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:3357 msgid "Rejected" msgstr "" @@ -2625,6 +2650,7 @@ msgstr "" #: 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_11_0_0.py:3331 #: 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 @@ -2633,7 +2659,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:3358 msgid "Under Review" msgstr "" @@ -2657,6 +2683,7 @@ msgstr "" #: 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_11_0_0.py:2604 #: 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 @@ -2665,7 +2692,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2631 msgid "Repository group no access" msgstr "" @@ -2689,6 +2716,7 @@ msgstr "" #: 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_11_0_0.py:2605 #: 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 @@ -2697,7 +2725,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2632 msgid "Repository group read access" msgstr "" @@ -2721,6 +2749,7 @@ msgstr "" #: 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_11_0_0.py:2606 #: 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 @@ -2729,7 +2758,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2633 msgid "Repository group write access" msgstr "" @@ -2753,6 +2782,7 @@ msgstr "" #: 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_11_0_0.py:2607 #: 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 @@ -2761,7 +2791,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2634 msgid "Repository group admin access" msgstr "" @@ -2784,6 +2814,7 @@ msgstr "" #: 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_11_0_0.py:2609 #: 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 @@ -2792,7 +2823,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2636 msgid "User group no access" msgstr "" @@ -2815,6 +2846,7 @@ msgstr "" #: 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_11_0_0.py:2610 #: 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 @@ -2823,7 +2855,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2637 msgid "User group read access" msgstr "" @@ -2846,6 +2878,7 @@ msgstr "" #: 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_11_0_0.py:2611 #: 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 @@ -2854,7 +2887,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2638 msgid "User group write access" msgstr "" @@ -2877,6 +2910,7 @@ msgstr "" #: 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_11_0_0.py:2612 #: 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 @@ -2885,7 +2919,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2639 msgid "User group admin access" msgstr "" @@ -2908,6 +2942,7 @@ msgstr "" #: 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_11_0_0.py:2614 #: 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 @@ -2916,7 +2951,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2641 msgid "Repository Group creation disabled" msgstr "" @@ -2939,6 +2974,7 @@ msgstr "" #: 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_11_0_0.py:2615 #: 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 @@ -2947,7 +2983,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2642 msgid "Repository Group creation enabled" msgstr "" @@ -2970,6 +3006,7 @@ msgstr "" #: 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_11_0_0.py:2617 #: 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 @@ -2978,7 +3015,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2644 msgid "User Group creation disabled" msgstr "" @@ -3001,6 +3038,7 @@ msgstr "" #: 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_11_0_0.py:2618 #: 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 @@ -3009,7 +3047,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2645 msgid "User Group creation enabled" msgstr "" @@ -3032,6 +3070,7 @@ msgstr "" #: 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_11_0_0.py:2628 #: 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 @@ -3040,7 +3079,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2655 msgid "Registration disabled" msgstr "" @@ -3063,6 +3102,7 @@ msgstr "" #: 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_11_0_0.py:2629 #: 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 @@ -3071,7 +3111,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2656 msgid "User Registration with manual account activation" msgstr "" @@ -3094,6 +3134,7 @@ msgstr "" #: 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_11_0_0.py:2630 #: 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 @@ -3102,7 +3143,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2657 msgid "User Registration with automatic account activation" msgstr "" @@ -3125,6 +3166,7 @@ msgstr "" #: 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_11_0_0.py:2636 #: 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 @@ -3133,7 +3175,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2663 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "" @@ -3156,6 +3198,7 @@ msgstr "" #: 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_11_0_0.py:2637 #: 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 @@ -3164,7 +3207,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2664 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "" @@ -3181,6 +3224,7 @@ msgstr "" #: 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_11_0_0.py:2622 #: 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 @@ -3189,7 +3233,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2649 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3207,6 +3251,7 @@ msgstr "" #: 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_11_0_0.py:2623 #: 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 @@ -3215,7 +3260,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2650 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3230,6 +3275,7 @@ msgstr "" #: 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_11_0_0.py:2597 #: 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 @@ -3238,7 +3284,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2624 msgid "RhodeCode Super Administrator" msgstr "" @@ -3250,6 +3296,7 @@ msgstr "" #: 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_11_0_0.py:2639 #: 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 @@ -3258,7 +3305,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2666 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3270,6 +3317,7 @@ msgstr "" #: 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_11_0_0.py:2640 #: 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 @@ -3278,10 +3326,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2667 msgid "Inherit object permissions from default user enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 #: 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 @@ -3290,10 +3339,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: 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 +#: rhodecode/model/db.py:1107 msgid "all" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3302,10 +3352,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: 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 +#: rhodecode/model/db.py:1108 msgid "http/web interface" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3314,10 +3365,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: 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 +#: rhodecode/model/db.py:1109 msgid "vcs (git/hg/svn protocol)" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3326,10 +3378,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: 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 +#: rhodecode/model/db.py:1110 msgid "api calls" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 #: 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 @@ -3338,10 +3391,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:1111 msgid "feed access" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 #: 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 @@ -3350,60 +3404,51 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2387 msgid "No parent" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 #: 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 +#: rhodecode/model/db.py:2659 msgid "Password reset enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 #: 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 +#: rhodecode/model/db.py:2660 msgid "Password reset hidden" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 #: 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 +#: rhodecode/model/db.py:2661 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:150 -msgid "Invalid search query. Try quoting it." -msgstr "Consulta de búsqueda inválidad. Intente agregar comillas." - -#: rhodecode/lib/index/whoosh.py:152 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "No hay un índice en el cual buscar. Por favor execute el indexador whoosh" - -#: rhodecode/lib/index/whoosh.py:157 -msgid "An error occurred during this search operation" -msgstr "Un error ocurrió durante esta operación de búsqueda" - -#: rhodecode/lib/index/whoosh.py:165 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:166 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" @@ -3423,28 +3468,28 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:382 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:376 +#: rhodecode/model/comment.py:383 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:87 +#: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "" -#: rhodecode/model/forms.py:88 +#: rhodecode/model/forms.py:89 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: rhodecode/model/forms.py:98 +#: rhodecode/model/forms.py:99 msgid "Please enter a password" msgstr "" -#: rhodecode/model/forms.py:99 +#: rhodecode/model/forms.py:100 #, python-format msgid "Enter %(min)i characters or more" msgstr "" @@ -3531,8 +3576,8 @@ msgstr "" #: 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 -#: rhodecode/templates/changeset/changeset_file_comment.mako:321 +#: rhodecode/templates/changeset/changeset_file_comment.mako:272 +#: rhodecode/templates/changeset/changeset_file_comment.mako:322 msgid "Write" msgstr "" @@ -3566,8 +3611,8 @@ 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:417 -#: rhodecode/templates/base/base.mako:424 +#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:426 msgid "Admin" msgstr "" @@ -3684,115 +3729,79 @@ msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1218 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1168 +#: rhodecode/model/pull_request.py:1220 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1181 +#: rhodecode/model/pull_request.py:1233 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1200 +#: rhodecode/model/pull_request.py:1252 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1203 +#: rhodecode/model/pull_request.py:1255 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 +#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1370 +#: rhodecode/model/pull_request.py:1425 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1373 +#: rhodecode/model/pull_request.py:1428 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1533 +#: rhodecode/model/pull_request.py:1588 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1546 +#: rhodecode/model/pull_request.py:1601 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:1561 +#: rhodecode/model/pull_request.py:1616 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1564 +#: rhodecode/model/pull_request.py:1619 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1599 +#: rhodecode/model/pull_request.py:1654 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1604 +#: rhodecode/model/pull_request.py:1659 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1611 +#: rhodecode/model/pull_request.py:1666 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1613 +#: rhodecode/model/pull_request.py:1668 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:762 +#: rhodecode/model/scm.py:775 msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:166 -msgid "You can't Edit this user since it's crucial for entire application" -msgstr "" - -#: 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:506 -msgid "You can't remove this user since it's crucial for entire application" -msgstr "" - -#: 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: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:532 -#, python-format -msgid "" -"user \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups:%s" -msgstr "" - -#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99 +#: rhodecode/model/validators.py:92 rhodecode/model/validators.py:93 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:142 +#: rhodecode/model/validators.py:139 msgid "Pattern already exists" msgstr "" @@ -3813,30 +3822,26 @@ msgid "" "dashes and must begin with alphanumeric character or underscore" msgstr "" -#: rhodecode/model/validators.py:192 -msgid "The input is not valid" -msgstr "" - -#: rhodecode/model/validators.py:199 +#: rhodecode/model/validators.py:195 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: rhodecode/model/validators.py:200 +#: rhodecode/model/validators.py:196 #, python-format msgid "Username %(username)s is disabled" msgstr "" -#: rhodecode/model/validators.py:223 +#: rhodecode/model/validators.py:221 msgid "Invalid user group name" msgstr "" -#: rhodecode/model/validators.py:224 +#: rhodecode/model/validators.py:222 #, python-format msgid "User group `%(usergroup)s` already exists" msgstr "" -#: rhodecode/model/validators.py:226 +#: rhodecode/model/validators.py:224 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -3864,166 +3869,166 @@ msgstr "" msgid "no permission to store repository group in root location" msgstr "" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:387 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: rhodecode/model/validators.py:401 -msgid "Invalid old password" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:406 msgid "Passwords do not match" msgstr "" -#: rhodecode/model/validators.py:436 +#: rhodecode/model/validators.py:426 msgid "invalid password" msgstr "" -#: rhodecode/model/validators.py:437 +#: rhodecode/model/validators.py:427 msgid "invalid user name" msgstr "" -#: rhodecode/model/validators.py:438 +#: rhodecode/model/validators.py:428 msgid "Your account is disabled" msgstr "" -#: rhodecode/model/validators.py:470 -msgid "Token mismatch" -msgstr "" - -#: rhodecode/model/validators.py:484 +#: rhodecode/model/validators.py:464 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: rhodecode/model/validators.py:486 +#: rhodecode/model/validators.py:466 #, python-format msgid "Repository with name %(repo)s already exists" msgstr "" -#: rhodecode/model/validators.py:488 +#: rhodecode/model/validators.py:468 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:491 +#: rhodecode/model/validators.py:471 #, python-format msgid "Repository with name %(repo)s exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:493 +#: rhodecode/model/validators.py:473 #, python-format msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:566 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219 msgid "Repository name cannot end with .git" msgstr "" -#: rhodecode/model/validators.py:640 +#: rhodecode/model/validators.py:626 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "" -#: rhodecode/model/validators.py:641 +#: rhodecode/model/validators.py:627 #, python-format msgid "" "Invalid clone url, provide a valid clone url starting with one of " "%(allowed_prefixes)s" msgstr "" -#: rhodecode/model/validators.py:670 +#: rhodecode/model/validators.py:659 msgid "Fork have to be the same type as parent" msgstr "" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:676 msgid "You do not have the permission to create repositories in this group." msgstr "" -#: rhodecode/model/validators.py:688 +#: rhodecode/model/validators.py:679 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "" "You do not have the permission to store repositories in the root location." msgstr "" -#: rhodecode/model/validators.py:748 +#: rhodecode/model/validators.py:739 msgid "This username or user group name is not valid" msgstr "" -#: rhodecode/model/validators.py:879 +#: rhodecode/model/validators.py:852 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:894 +#: rhodecode/model/validators.py:870 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:914 +#: rhodecode/model/validators.py:892 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:935 +#: rhodecode/model/validators.py:913 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:966 -#: rhodecode/model/validation_schema/validators.py:40 -#: rhodecode/model/validation_schema/validators.py:53 +#: rhodecode/model/validators.py:946 +#: rhodecode/model/validation_schema/validators.py:41 +#: rhodecode/model/validation_schema/validators.py:54 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:967 +#: rhodecode/model/validators.py:947 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:994 +#: rhodecode/model/validators.py:975 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: rhodecode/model/validators.py:1009 +#: rhodecode/model/validators.py:992 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: rhodecode/model/validators.py:1012 +#: rhodecode/model/validators.py:995 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "" -#: rhodecode/model/validators.py:1015 +#: rhodecode/model/validators.py:998 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validators.py:1017 +#: rhodecode/model/validators.py:1000 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validation_schema/validators.py:61 +#: rhodecode/model/validators.py:1068 +msgid "Url must start with http or /" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:62 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:70 +#: rhodecode/model/validation_schema/validators.py:71 msgid "Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/validators.py:132 +#: rhodecode/model/validation_schema/validators.py:133 msgid "" "Invalid clone url, provide a valid clone url starting with one of " "{allowed_prefixes}" msgstr "" -#: rhodecode/model/validation_schema/validators.py:138 +#: rhodecode/model/validation_schema/validators.py:139 msgid "invalid clone url for {repo_type} repository" msgstr "" +#: rhodecode/model/validation_schema/validators.py:148 +msgid "Please enter a valid json object" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -4072,35 +4077,35 @@ msgstr "" msgid "Integration scope" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 msgid "General integration options" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 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:113 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: 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:136 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4140,451 +4145,451 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: 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/rhodecode-components.js:28706 +#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: 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/rhodecode-components.js:30637 +#: rhodecode/public/js/scripts.js:22485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: 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/rhodecode-components.js:30638 +#: rhodecode/public/js/scripts.js:22486 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: 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/rhodecode-components.js:30639 +#: rhodecode/public/js/scripts.js:22487 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: 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/rhodecode-components.js:30640 +#: rhodecode/public/js/scripts.js:22488 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: 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/rhodecode-components.js:30641 +#: rhodecode/public/js/scripts.js:22489 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: 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/rhodecode-components.js:30642 +#: rhodecode/public/js/scripts.js:22490 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: 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/rhodecode-components.js:30662 +#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: 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/rhodecode-components.js:30670 +#: rhodecode/public/js/scripts.js:22518 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: 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/rhodecode-components.js:30682 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: 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/rhodecode-components.js:30684 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: 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/rhodecode-components.js:30688 +#: rhodecode/public/js/scripts.js:22536 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: 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/rhodecode-components.js:30690 +#: rhodecode/public/js/scripts.js:22538 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: 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/rhodecode-components.js:30692 +#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: 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-components.js:44751 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: 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-components.js:44754 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: 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-components.js:44757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: 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-components.js:44760 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: 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-components.js:44764 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: 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:43213 -#: rhodecode/public/js/scripts.js:35061 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:44766 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: 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:43218 -#: rhodecode/public/js/scripts.js:35066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:44771 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: 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-components.js:44773 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: 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-components.js:44778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: 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-components.js:44780 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: 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-components.js:44784 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: 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-components.js:44786 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: 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/rhodecode-components.js:45724 +#: rhodecode/public/js/scripts.js:37528 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: 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/rhodecode-components.js:45726 +#: rhodecode/public/js/scripts.js:37530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: 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/rhodecode-components.js:46172 +#: rhodecode/public/js/scripts.js:37976 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: 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/rhodecode-components.js:46191 +#: rhodecode/public/js/scripts.js:37995 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: 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/rhodecode-components.js:46210 +#: rhodecode/public/js/scripts.js:38014 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:44673 -#: rhodecode/public/js/scripts.js:36521 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:46230 +#: rhodecode/public/js/scripts.js:38034 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: 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/rhodecode-components.js:46597 +#: rhodecode/public/js/scripts.js:38401 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: 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/rhodecode-components.js:46681 +#: rhodecode/public/js/scripts.js:38485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: 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/rhodecode-components.js:46696 +#: rhodecode/public/js/scripts.js:38500 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: 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:45296 -#: rhodecode/public/js/scripts.js:37144 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:46853 +#: rhodecode/public/js/scripts.js:38657 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "" -#: 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/rhodecode-components.js:46904 +#: rhodecode/public/js/scripts.js:38708 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: 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:45452 -#: rhodecode/public/js/scripts.js:37300 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:538 +#: rhodecode/public/js/rhodecode-components.js:47014 +#: rhodecode/public/js/scripts.js:38818 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/comments.js:543 msgid "Delete this comment?" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47084 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:613 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47161 +#: rhodecode/public/js/scripts.js:38965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode/comments.js:690 msgid "Leave a comment on line {0}." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47275 +#: rhodecode/public/js/scripts.js:39079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/comments.js:804 msgid "TODO from comment {0} was fixed." msgstr "" -#: 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/rhodecode-components.js:47455 +#: rhodecode/public/js/scripts.js:39259 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: 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/rhodecode-components.js:47457 +#: rhodecode/public/js/scripts.js:39261 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: 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/rhodecode-components.js:47466 +#: rhodecode/public/js/scripts.js:39270 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: 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/rhodecode-components.js:47601 +#: rhodecode/public/js/scripts.js:39405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: 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/rhodecode-components.js:47641 +#: rhodecode/public/js/scripts.js:39445 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: 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/rhodecode-components.js:47642 +#: rhodecode/public/js/scripts.js:39446 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: 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/rhodecode-components.js:47651 +#: rhodecode/public/js/scripts.js:39455 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: 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/rhodecode-components.js:47652 +#: rhodecode/public/js/scripts.js:39456 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: 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/rhodecode-components.js:48032 +#: rhodecode/public/js/scripts.js:39836 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: 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:46510 -#: rhodecode/public/js/scripts.js:38358 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:48041 +#: rhodecode/public/js/scripts.js:39845 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48046 +#: rhodecode/public/js/scripts.js:39850 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: 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/rhodecode-components.js:48052 +#: rhodecode/public/js/scripts.js:39856 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48068 +#: rhodecode/public/js/scripts.js:39872 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46530 -#: rhodecode/public/js/scripts.js:38378 +#: rhodecode/public/js/rhodecode-components.js:48075 +#: rhodecode/public/js/scripts.js:39879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48082 +#: rhodecode/public/js/scripts.js:39886 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48096 +#: rhodecode/public/js/scripts.js:39900 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48198 +#: rhodecode/public/js/scripts.js:40002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:300 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46823 -#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode-components.js:48204 +#: rhodecode/public/js/scripts.js:40008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +msgid "User `{0}` already in reviewers" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48334 +#: rhodecode/public/js/scripts.js:40138 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:436 msgid "added manually by \"{0}\"" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48338 +#: rhodecode/public/js/scripts.js:40142 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:440 msgid "member of \"{0}\"" msgstr "" -#: 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/rhodecode-components.js:48924 +#: rhodecode/public/js/scripts.js:40728 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: 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/rhodecode-components.js:48944 +#: rhodecode/public/js/scripts.js:40748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: 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 +#: rhodecode/public/js/rhodecode-components.js:49356 +#: rhodecode/public/js/scripts.js:41160 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode.js:574 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 +#: rhodecode/public/js/rhodecode-components.js:49364 +#: rhodecode/public/js/scripts.js:41168 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/src/rhodecode.js:582 msgid "Specified expiration date" msgstr "" @@ -4593,174 +4598,180 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:488 -#: rhodecode/templates/codeblocks/diffs.mako:493 +#: rhodecode/templates/codeblocks/diffs.mako:494 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Add another comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 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/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No branches available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No forks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No gists available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No repositories available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No repository groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 msgid "No ssh keys available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 msgid "No tags available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 msgid "No user groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No users available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/templates/changelog/changelog.mako:59 msgid "Open new pull request" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: 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:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 msgid "{0} out of {1} ssh keys" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 msgid "{0} years" msgstr "" @@ -4834,12 +4845,17 @@ msgstr "" msgid "Edit Repository Group" msgstr "" -#: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:68 +msgid "No repositories or repositories groups exists here." +msgstr "" + +#: rhodecode/templates/index_base.mako:86 +#: rhodecode/templates/index_base.mako:116 #: rhodecode/templates/admin/gists/index.mako:112 #: 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_user_group_membership.mako:39 #: 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 @@ -4856,13 +4872,14 @@ msgstr "" msgid "Name" msgstr "" -#: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/index_base.mako:89 +#: rhodecode/templates/index_base.mako:119 #: 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/my_account/my_account_user_group_membership.mako:44 #: 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:55 @@ -4892,20 +4909,21 @@ msgstr "" #: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 -#: rhodecode/templates/summary/components.mako:82 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.mako:103 -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:92 +#: rhodecode/templates/index_base.mako:122 #: 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/index_base.mako:94 +#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 @@ -4917,11 +4935,11 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:68 -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:209 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.mako:134 +#: rhodecode/templates/index_base.mako:125 #: 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 @@ -4933,7 +4951,7 @@ msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4950,7 +4968,7 @@ msgid "Home" msgstr "" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:343 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "" @@ -4974,7 +4992,7 @@ msgstr "" #: rhodecode/templates/login.mako:68 #: rhodecode/templates/password_reset.mako:37 -#: rhodecode/templates/base/base.mako:46 +#: rhodecode/templates/base/base.mako:48 #: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "" @@ -5129,7 +5147,7 @@ msgid "Repository" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:77 msgid "Admin audit logs" msgstr "" @@ -5316,7 +5334,7 @@ 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/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 @@ -5390,7 +5408,7 @@ msgstr "" #: 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:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5493,8 +5511,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: 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:249 +#: rhodecode/templates/base/base.mako:86 +#: rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "" @@ -5597,7 +5615,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:355 +#: rhodecode/templates/base/base.mako:357 msgid "My account" msgstr "" @@ -5625,35 +5643,40 @@ msgstr "" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:36 -msgid "OAuth Identities" +#: rhodecode/templates/admin/my_account/my_account.mako:33 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 +msgid "User Group Membership" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:38 +msgid "OAuth Identities" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "Watched" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:43 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 -#: rhodecode/templates/base/base.mako:239 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:44 #: 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 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:82 msgid "Permissions" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:45 msgid "Live Notifications" msgstr "" @@ -5879,6 +5902,23 @@ msgid "" "sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +msgid "Click add to use this generate SSH key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 +#: 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: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 +#: rhodecode/templates/admin/users/users.mako:74 +msgid "Active" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" @@ -6092,8 +6132,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:77 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:153 msgid "Repository groups" msgstr "" @@ -6282,7 +6322,7 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:196 +#: rhodecode/templates/base/base.mako:198 msgid "Clone from" msgstr "" @@ -6362,7 +6402,7 @@ msgid "Remote" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:143 +#: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "" @@ -6387,100 +6427,104 @@ msgstr "" msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Attached scoped tokens" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:25 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 msgid "Set" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40 msgid "Manually set this repository as a fork of another from the list" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:49 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 msgid "" "All actions made on this repository will be visible to everyone following " "the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "" "Force repository locking. This only works when anonymous access is disabled." " Pulling from the repository locks the repository to that user until the " "same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 #: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 msgid "" "This repository will be renamed in a special way in order to make it " "inaccessible to RhodeCode Enterprise and its VCS systems. If you need to " @@ -6488,11 +6532,11 @@ msgid "" "rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" @@ -6540,17 +6584,6 @@ msgstr "" msgid "Key" 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: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 -#: rhodecode/templates/admin/users/users.mako:74 -msgid "Active" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" @@ -6712,7 +6745,7 @@ msgid "Settings for Repository: %s" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 -msgid "Non-changeable id" +msgid "permalink id" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 @@ -6907,7 +6940,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:210 +#: rhodecode/templates/admin/settings/settings_visual.mako:214 msgid "Save settings" msgstr "" @@ -7201,6 +7234,14 @@ msgstr "" msgid "Gunicorn process management" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:11 +msgid "start auto refresh" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:12 +msgid "stop auto refresh" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -7251,13 +7292,6 @@ msgstr "" msgid "Cleanup sessions" msgstr "" -#: rhodecode/templates/admin/settings/settings_supervisor_tail.mako:1 -#, python-format -msgid "" -"Last %(size)s bytes of process logs, use ?offset=[num] GET param to set " -"custom size" -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7413,24 +7447,26 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:170 -msgid "Clone URL" +msgid "Clone URL templates" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:179 +#: rhodecode/templates/admin/settings/settings_visual.mako:181 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" " {user} current user username,\n" +" {sys_user} current system user running this process, usefull for ssh,\n" +" {hostname} hostname of this server running RhodeCode,\n" " {netloc} network location/server host of running RhodeCode server,\n" " {repo} full repository name,\n" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:192 +#: rhodecode/templates/admin/settings/settings_visual.mako:196 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:200 +#: rhodecode/templates/admin/settings/settings_visual.mako:204 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7445,8 +7481,8 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:79 -#: rhodecode/templates/base/base.mako:154 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:156 msgid "User groups" msgstr "" @@ -7594,7 +7630,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:80 msgid "Users" msgstr "" @@ -7858,13 +7894,17 @@ msgstr "" msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:25 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" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 +msgid "Use this generated key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +msgid "Confirmation required on the next screen" msgstr "" #: rhodecode/templates/admin/users/users.mako:5 @@ -7875,174 +7915,174 @@ msgstr "" msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:53 +#: rhodecode/templates/base/base.mako:55 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:83 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:83 +#: rhodecode/templates/base/base.mako:85 msgid "Defaults" msgstr "" -#: rhodecode/templates/base/base.mako:101 +#: rhodecode/templates/base/base.mako:103 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:188 +#: rhodecode/templates/base/base.mako:190 msgid "Fork of" msgstr "" -#: rhodecode/templates/base/base.mako:205 +#: rhodecode/templates/base/base.mako:207 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:210 +#: rhodecode/templates/base/base.mako:212 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:228 +#: rhodecode/templates/base/base.mako:230 #: 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/base/base.mako:231 #: 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/base/base.mako:232 #: 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:231 +#: rhodecode/templates/base/base.mako:233 #: 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:235 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:245 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: 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/base/base.mako:269 +#: rhodecode/templates/base/base.mako:413 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "" -#: rhodecode/templates/base/base.mako:271 +#: rhodecode/templates/base/base.mako:273 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:273 +#: rhodecode/templates/base/base.mako:275 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/base/base.mako:280 #: rhodecode/templates/data_table/_dt_elements.mako:61 #: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "" -#: rhodecode/templates/base/base.mako:279 +#: rhodecode/templates/base/base.mako:281 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:303 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:309 +#: rhodecode/templates/base/base.mako:311 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/base/base.mako:328 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:336 +#: rhodecode/templates/base/base.mako:338 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:338 +#: rhodecode/templates/base/base.mako:340 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:357 +#: rhodecode/templates/base/base.mako:359 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:361 +#: rhodecode/templates/base/base.mako:363 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:393 +#: rhodecode/templates/base/base.mako:395 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:396 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:15 msgid "Journal" msgstr "" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:401 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:402 msgid "Public journal" msgstr "" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:407 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:408 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:412 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/base/base.mako:418 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:433 -#: rhodecode/templates/base/base.mako:434 +#: rhodecode/templates/base/base.mako:435 +#: rhodecode/templates/base/base.mako:436 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8064,15 +8104,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:491 +#: rhodecode/templates/base/base.mako:493 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:546 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:554 msgid "Site-wide shortcuts" msgstr "" @@ -8179,8 +8219,8 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:274 -#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:325 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8525,10 +8565,10 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changelog/changelog_elements.mako:121 #: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 -#: rhodecode/templates/summary/summary_commits.mako:62 +#: rhodecode/templates/summary/summary_commits.mako:68 #, python-format msgid "Bookmark %s" msgstr "" @@ -8547,10 +8587,10 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changelog/changelog_elements.mako:113 #: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 -#: rhodecode/templates/summary/summary_commits.mako:76 +#: rhodecode/templates/summary/summary_commits.mako:82 #, python-format msgid "Branch %s" msgstr "" @@ -8615,79 +8655,79 @@ msgstr "" msgid "load previous" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/summary/summary_commits.mako:21 +#: rhodecode/templates/changelog/changelog_elements.mako:32 +#: rhodecode/templates/summary/summary_commits.mako:27 #, python-format msgid "" "Commit status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/summary/summary_commits.mako:25 +#: rhodecode/templates/changelog/changelog_elements.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: {}" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/summary/summary_commits.mako:31 +#: rhodecode/templates/changelog/changelog_elements.mako:42 +#: rhodecode/templates/summary/summary_commits.mako:37 msgid "Commit status: Not Reviewed" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/summary/summary_commits.mako:36 +#: rhodecode/templates/changelog/changelog_elements.mako:47 +#: rhodecode/templates/summary/summary_commits.mako:42 msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changelog/changelog_elements.mako:58 #: rhodecode/templates/changeset/changeset.mako:42 msgid "Copy the full commit id" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changelog/changelog_elements.mako:65 #: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:72 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: rhodecode/templates/changeset/changeset.mako:50 #: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:72 #: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: 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/changelog/changelog_elements.mako:83 +#: rhodecode/templates/compare/compare_commits.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changelog/changelog_elements.mako:107 #: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 -#: rhodecode/templates/summary/summary_commits.mako:69 +#: rhodecode/templates/summary/summary_commits.mako:75 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:137 +#: rhodecode/templates/changelog/changelog_elements.mako:143 msgid "load next" msgstr "" @@ -8722,7 +8762,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:81 +#: rhodecode/templates/changeset/changeset_file_comment.mako:82 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8738,8 +8778,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:445 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:451 +#: rhodecode/templates/codeblocks/diffs.mako:454 msgid "Raw diff" msgstr "" @@ -8756,8 +8796,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:452 -#: rhodecode/templates/codeblocks/diffs.mako:455 +#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:461 msgid "Download diff" msgstr "" @@ -8781,103 +8821,103 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:32 +#: rhodecode/templates/changeset/changeset_file_comment.mako:33 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:39 +#: rhodecode/templates/changeset/changeset_file_comment.mako:40 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:66 -#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:67 +#: rhodecode/templates/changeset/changeset_file_comment.mako:69 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:73 +#: rhodecode/templates/changeset/changeset_file_comment.mako:74 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:88 +#: rhodecode/templates/changeset/changeset_file_comment.mako:89 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 msgid "Pull request author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +#: rhodecode/templates/changeset/changeset_file_comment.mako:98 msgid "author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:105 +#: rhodecode/templates/changeset/changeset_file_comment.mako:106 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:109 -#: rhodecode/templates/changeset/changeset_file_comment.mako:124 +#: rhodecode/templates/changeset/changeset_file_comment.mako:110 +#: rhodecode/templates/changeset/changeset_file_comment.mako:125 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:121 +#: rhodecode/templates/changeset/changeset_file_comment.mako:122 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:151 -#: rhodecode/templates/changeset/changeset_file_comment.mako:154 -msgid "Prev" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:152 #: rhodecode/templates/changeset/changeset_file_comment.mako:155 +msgid "Prev" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:153 +#: rhodecode/templates/changeset/changeset_file_comment.mako:156 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:191 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:193 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:195 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: 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:65 +msgid "You need to be logged in to leave comments." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:348 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "" "Use @username inside this text to send notification to this RhodeCode user" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 +#: rhodecode/templates/changeset/changeset_file_comment.mako:352 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:368 +#: rhodecode/templates/changeset/changeset_file_comment.mako:369 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:398 +#: rhodecode/templates/changeset/changeset_file_comment.mako:399 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8974,71 +9014,71 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:290 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/codeblocks/diffs.mako:356 #: 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 +#: rhodecode/templates/codeblocks/diffs.mako:421 +#: rhodecode/templates/codeblocks/diffs.mako:437 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:417 -#: rhodecode/templates/codeblocks/diffs.mako:424 +#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:430 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:422 -#: rhodecode/templates/codeblocks/diffs.mako:438 +#: rhodecode/templates/codeblocks/diffs.mako:428 +#: rhodecode/templates/codeblocks/diffs.mako:444 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:433 -#: rhodecode/templates/codeblocks/diffs.mako:440 +#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:446 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:643 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:651 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:649 +#: rhodecode/templates/codeblocks/diffs.mako:655 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:650 +#: rhodecode/templates/codeblocks/diffs.mako:656 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:660 +#: rhodecode/templates/codeblocks/diffs.mako:666 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:664 +#: rhodecode/templates/codeblocks/diffs.mako:670 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:668 +#: rhodecode/templates/codeblocks/diffs.mako:674 msgid "Wide Mode Diff" msgstr "" @@ -9055,11 +9095,11 @@ msgid "Compare was calculated based on this shared commit." msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:78 msgid "No commits in this compare" msgstr "" @@ -9630,7 +9670,7 @@ msgid "Close File List" msgstr "" #: rhodecode/templates/files/files_browser.mako:25 -#: rhodecode/templates/summary/summary_commits.mako:103 +#: rhodecode/templates/summary/summary_commits.mako:109 msgid "Add New File" msgstr "" @@ -9906,12 +9946,12 @@ msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 msgid "Add reviewer or reviewer group" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:504 +#: rhodecode/templates/pullrequests/pullrequest.mako:508 msgid "Please select source and target" msgstr "" @@ -9919,19 +9959,19 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:364 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:368 +#: rhodecode/templates/pullrequests/pullrequest.mako:371 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:431 +#: rhodecode/templates/pullrequests/pullrequest.mako:435 msgid "Target repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:441 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Select commit reference" msgstr "" @@ -9992,8 +10032,7 @@ msgid "Merge" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:140 -#: rhodecode/templates/summary/components.mako:53 -#: rhodecode/templates/summary/components.mako:69 +#: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" @@ -10073,85 +10112,81 @@ msgid "Pull request versions not available" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 -msgid "Mandatory reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 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:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 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:431 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 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:442 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 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:482 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:593 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:596 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 msgid "show them" msgstr "" @@ -10262,74 +10297,59 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/components.mako:49 -msgid "Read-only url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -#: rhodecode/templates/summary/components.mako:72 +#: rhodecode/templates/summary/components.mako:71 msgid "Copy the clone by id url" msgstr "" -#: rhodecode/templates/summary/components.mako:58 -#: rhodecode/templates/summary/components.mako:74 -msgid "Show by Name" +#: rhodecode/templates/summary/components.mako:76 +msgid "Copy the clone by ssh url" msgstr "" -#: rhodecode/templates/summary/components.mako:59 -#: rhodecode/templates/summary/components.mako:75 -msgid "Show by ID" -msgstr "" - -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:65 -msgid "Clone url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:94 +#: rhodecode/templates/summary/components.mako:100 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:110 +#: rhodecode/templates/summary/components.mako:116 msgid "Number of Repository Forks" msgstr "" -#: rhodecode/templates/summary/components.mako:118 +#: rhodecode/templates/summary/components.mako:124 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:149 +#: rhodecode/templates/summary/components.mako:155 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:153 +#: rhodecode/templates/summary/components.mako:159 msgid "Statistics are disabled for this repository" msgstr "Las estadísticas para este repositorio están deshabilitadas" -#: rhodecode/templates/summary/components.mako:156 +#: rhodecode/templates/summary/components.mako:162 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:167 +#: rhodecode/templates/summary/components.mako:173 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:173 +#: rhodecode/templates/summary/components.mako:179 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/components.mako:177 +#: rhodecode/templates/summary/components.mako:183 msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/components.mako:180 +#: rhodecode/templates/summary/components.mako:186 msgid "enable downloads" msgstr "" @@ -10362,15 +10382,15 @@ msgstr "" msgid "%s RSS feed" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:100 +#: rhodecode/templates/summary/summary_commits.mako:106 msgid "Add or upload files directly via RhodeCode:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:111 +#: rhodecode/templates/summary/summary_commits.mako:117 msgid "Push new repo:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:128 msgid "Existing repository?" msgstr "" @@ -10398,9 +10418,3 @@ msgstr "" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" msgstr "" - -#: rhodecode/tests/lib/test_ext_json.py:163 -msgid "singular" -msgid_plural "plural" -msgstr[0] "" -msgstr[1] "" diff --git a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo index 016588dd..3da6e9c7 100644 Binary files a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo and b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo differ diff --git a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po index ed2caf9e..e8dff5cc 100644 --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po @@ -1,5 +1,5 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2017 RhodeCode GmbH +# Copyright (C) 2018 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-11-03 16:42+0100\n" -"PO-Revision-Date: 2017-11-03 15:43+0000\n" +"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"PO-Revision-Date: 2018-01-30 16:33+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,32 +20,53 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/apps/_base/__init__.py:142 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "" + +#: rhodecode/apps/_base/__init__.py:146 +#, python-format +msgid "Error creating repository %s" +msgstr "" + +#: rhodecode/apps/_base/__init__.py:219 +#, python-format +msgid "" +"The repository `%(repo_name)s` cannot be loaded in filesystem. Please check " +"if it exist, or is not damaged." +msgstr "" + +#: rhodecode/apps/_base/__init__.py:274 +msgid "Editing user `{}` is disabled." +msgstr "" + +#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "Global" -#: rhodecode/apps/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:74 #: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "" -#: rhodecode/apps/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:76 msgid "Visual" msgstr "" -#: rhodecode/apps/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:78 msgid "Remap and Rescan" msgstr "" -#: rhodecode/apps/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:80 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "Gestionnaire de défaut" -#: rhodecode/apps/admin/navigation.py:89 -#: rhodecode/integrations/types/email.py:232 +#: rhodecode/apps/admin/navigation.py:82 +#: rhodecode/integrations/types/email.py:233 #: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 @@ -57,15 +78,15 @@ msgstr "Gestionnaire de défaut" msgid "Email" msgstr "Courriel" -#: rhodecode/apps/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:84 msgid "Hooks" msgstr "Hooks" -#: rhodecode/apps/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:86 msgid "Full Text Search" msgstr "" -#: rhodecode/apps/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:88 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -79,28 +100,28 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 #: rhodecode/templates/admin/repos/repo_edit.mako:75 -#: rhodecode/templates/base/base.mako:82 +#: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "Intégrations" -#: rhodecode/apps/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:90 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "Information système" -#: rhodecode/apps/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:92 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:94 msgid "User Sessions" msgstr "Session utilisateur" -#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/apps/admin/navigation.py:96 msgid "Open Source Licenses" msgstr "Licences Logiciel Libre" -#: rhodecode/apps/admin/navigation.py:109 +#: rhodecode/apps/admin/navigation.py:101 msgid "Labs" msgstr "" @@ -112,13 +133,13 @@ msgstr "Mise à jour des paramètres par défaut réussie" 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 +#: rhodecode/apps/admin/views/permissions.py:120 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:141 #: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:287 +#: rhodecode/apps/admin/views/permissions.py:288 msgid "Error occurred during update of permissions" msgstr "Une erreur est suvenue lors de la mise à jour des permissions" @@ -126,11 +147,11 @@ msgstr "Une erreur est suvenue lors de la mise à jour des permissions" msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:267 +#: rhodecode/apps/admin/views/permissions.py:268 msgid "Global permissions updated successfully" msgstr "Mise à jour des permission globales réussie" -#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/apps/admin/views/permissions.py:450 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:208 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -151,20 +172,20 @@ msgstr "Mise à jour des permission globales réussie" msgid "Edit" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:476 +#: rhodecode/apps/admin/views/permissions.py:478 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:479 +#: rhodecode/apps/admin/views/permissions.py:481 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:180 +#: rhodecode/apps/admin/views/repo_groups.py:181 #, python-format msgid "Created repository group %s" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:198 +#: rhodecode/apps/admin/views/repo_groups.py:199 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" @@ -173,10 +194,86 @@ msgstr "" msgid "Cleaned up old sessions" msgstr "Anciennes sessions nettoyées" -#: rhodecode/apps/admin/views/sessions.py:98 +#: rhodecode/apps/admin/views/sessions.py:97 msgid "Failed to cleanup up old sessions" msgstr "Les anciennes sessions n'ont pas pu être nettoyées" +#: rhodecode/apps/admin/views/settings.py:162 +#: rhodecode/apps/admin/views/settings.py:708 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:351 +msgid "Error occurred during updating application settings" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:194 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +msgid "Updated VCS settings" +msgstr "Réglages des gestionnaires de versions mis à jour." + +#: rhodecode/apps/admin/views/settings.py:268 +#, python-format +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:347 +msgid "Updated application settings" +msgstr "Réglages mis à jour" + +#: rhodecode/apps/admin/views/settings.py:426 +msgid "Updated visualisation settings" +msgstr "Réglages d’affichage mis à jour." + +#: rhodecode/apps/admin/views/settings.py:429 +msgid "Error occurred during updating visualisation settings" +msgstr "Une erreur est survenue lors de la mise à jour des paramètres de visualisation" + +#: rhodecode/apps/admin/views/settings.py:491 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +msgid "Invalid issue tracker pattern: {}" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:508 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:526 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:563 +msgid "Please enter email address" +msgstr "Entrez votre adresse de courriel SVP" + +#: rhodecode/apps/admin/views/settings.py:581 +msgid "Send email task created" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:631 +msgid "Added new hook" +msgstr "Le nouveau hook a été ajouté." + +#: rhodecode/apps/admin/views/settings.py:646 +msgid "Updated hooks" +msgstr "Hooks mis à jour" + +#: rhodecode/apps/admin/views/settings.py:650 +msgid "Error occurred during hook creation" +msgstr "Une erreur est survenue lors de la création du hook" + +#: rhodecode/apps/admin/views/settings.py:732 +msgid "Error occurred during updating labs settings" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:737 +msgid "Updated Labs settings" +msgstr "" + #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "La configuration Apache pour Subversion a été générée." @@ -185,149 +282,153 @@ msgstr "La configuration Apache pour Subversion a été générée." msgid "Failed to generate the Apache configuration for Subversion." msgstr "La configuration Apache pour Subversion n'a pas pu être générée." -#: rhodecode/apps/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:79 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" 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 +#: rhodecode/apps/admin/views/system_info.py:90 msgid "Update info" msgstr "Information de mise à jour" -#: rhodecode/apps/admin/views/system_info.py:104 +#: rhodecode/apps/admin/views/system_info.py:92 msgid "Check for updates" msgstr "Vérifier les mises à jour" -#: rhodecode/apps/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:97 msgid "RhodeCode Version" msgstr "Version de RhodeCode" -#: rhodecode/apps/admin/views/system_info.py:110 +#: rhodecode/apps/admin/views/system_info.py:98 +msgid "Latest version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:99 msgid "RhodeCode Server IP" msgstr "IP du serveur RhodeCode" -#: rhodecode/apps/admin/views/system_info.py:111 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "RhodeCode Server ID" msgstr "ID du serveur RhodeCode" -#: rhodecode/apps/admin/views/system_info.py:112 +#: rhodecode/apps/admin/views/system_info.py:101 msgid "RhodeCode Configuration" msgstr "Configuration de RhodeCode" -#: rhodecode/apps/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "RhodeCode Certificate" msgstr "Certificat de RhodeCode" -#: rhodecode/apps/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:103 msgid "Workers" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:115 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Worker Type" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "Database" msgstr "Base de données" -#: rhodecode/apps/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:109 msgid "Database version" msgstr "Version de la base de données" -#: rhodecode/apps/admin/views/system_info.py:124 +#: rhodecode/apps/admin/views/system_info.py:113 msgid "Platform" msgstr "Plate-forme" -#: rhodecode/apps/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Platform UUID" msgstr "UUID de la plate-forme" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Python version" msgstr "Version de Python" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:116 msgid "Python path" msgstr "Chemin d'accès de Python" -#: rhodecode/apps/admin/views/system_info.py:131 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "CPU" msgstr "UC" -#: rhodecode/apps/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Load" msgstr "Charge" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Memory" msgstr "Mémoire" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:123 msgid "Uptime" msgstr "Temps de fonctionnement" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Storage location" msgstr "Lieu de stockage" -#: rhodecode/apps/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Storage info" msgstr "Information de stockage" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Storage inodes" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "Gist storage location" msgstr "Lieu de stockage Gist" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Gist storage info" msgstr "Information de stockage Gist" -#: rhodecode/apps/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Archive cache storage location" msgstr "Lieu de stockage du cache de l'archive" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:148 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Temp storage location" msgstr "Lieu de stockage temporaire" -#: rhodecode/apps/admin/views/system_info.py:149 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Temp storage info" msgstr "Information de stockage temporaire" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Search info" msgstr "Information de recherche" -#: rhodecode/apps/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Search location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:156 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "VCS Backends" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:157 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "VCS Server" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:158 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "GIT" msgstr "GIT" -#: rhodecode/apps/admin/views/system_info.py:159 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "HG" msgstr "HG" -#: rhodecode/apps/admin/views/system_info.py:160 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "SVN" msgstr "SVN" @@ -341,188 +442,188 @@ msgstr "" msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:208 +#: rhodecode/apps/admin/views/users.py:209 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/apps/admin/views/users.py:229 +#: rhodecode/apps/admin/views/users.py:230 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:303 +#: rhodecode/apps/admin/views/users.py:304 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 +#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/my_account/views/my_account.py:490 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:353 +#: rhodecode/apps/admin/views/users.py:354 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:358 +#: rhodecode/apps/admin/views/users.py:359 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:366 +#: rhodecode/apps/admin/views/users.py:367 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:371 +#: rhodecode/apps/admin/views/users.py:372 #, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:379 +#: rhodecode/apps/admin/views/users.py:380 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:384 +#: rhodecode/apps/admin/views/users.py:385 #, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:401 +#: rhodecode/apps/admin/views/users.py:402 msgid "Successfully deleted user" msgstr "" -#: rhodecode/apps/admin/views/users.py:407 +#: rhodecode/apps/admin/views/users.py:408 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 +#: rhodecode/apps/admin/views/users.py:473 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 +#: rhodecode/apps/admin/views/users.py:479 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 +#: rhodecode/apps/admin/views/users.py:567 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:583 -#: rhodecode/apps/user_group/views/__init__.py:472 +#: rhodecode/apps/admin/views/users.py:585 +#: rhodecode/apps/user_group/views/__init__.py:448 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions." -#: rhodecode/apps/admin/views/users.py:608 +#: rhodecode/apps/admin/views/users.py:610 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:613 +#: rhodecode/apps/admin/views/users.py:615 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:622 +#: rhodecode/apps/admin/views/users.py:624 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 +#: rhodecode/apps/admin/views/users.py:663 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:667 +#: rhodecode/apps/admin/views/users.py:669 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/apps/admin/views/users.py:671 +#: rhodecode/apps/admin/views/users.py:673 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:676 +#: rhodecode/apps/admin/views/users.py:678 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/apps/admin/views/users.py:701 +#: rhodecode/apps/my_account/views/my_account.py:160 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "Rôle" -#: rhodecode/apps/admin/views/users.py:737 -#: rhodecode/apps/my_account/views/my_account.py:193 +#: rhodecode/apps/admin/views/users.py:739 +#: rhodecode/apps/my_account/views/my_account.py:194 msgid "Auth token successfully created" msgstr "Jeton d'authentification créé avec succès" -#: rhodecode/apps/admin/views/users.py:766 -#: rhodecode/apps/my_account/views/my_account.py:217 +#: rhodecode/apps/admin/views/users.py:768 +#: rhodecode/apps/my_account/views/my_account.py:218 msgid "Auth token successfully deleted" msgstr "Jeton d'authentification supprimé avec succès" -#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/admin/views/users.py:840 #: 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/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:849 #: 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/admin/views/users.py:883 #: 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 +#: rhodecode/apps/admin/views/users.py:929 +#: rhodecode/apps/my_account/views/my_account.py:260 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:928 +#: rhodecode/apps/admin/views/users.py:935 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 +#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/my_account/views/my_account.py:266 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:959 +#: rhodecode/apps/admin/views/users.py:966 msgid "Removed email address from user account" msgstr "Adresse de courriel supprimée du compte de l'utilisateur" -#: rhodecode/apps/admin/views/users.py:1005 +#: rhodecode/apps/admin/views/users.py:1012 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1023 +#: rhodecode/apps/admin/views/users.py:1034 msgid "An error occurred during ip saving" msgstr "Une erreur est survenue lors de la sauvegarde de l'IP" -#: rhodecode/apps/admin/views/users.py:1027 +#: rhodecode/apps/admin/views/users.py:1038 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1057 +#: rhodecode/apps/admin/views/users.py:1068 msgid "Removed ip address from user whitelist" msgstr "Adresses IP supprimées de la liste blanche de l'utilisateur" -#: rhodecode/apps/admin/views/users.py:1122 +#: rhodecode/apps/admin/views/users.py:1133 msgid "Groups successfully changed" msgstr "Groupes modifiés avec succès" @@ -547,10 +648,10 @@ 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 +#: rhodecode/public/js/rhodecode-components.js:49320 +#: rhodecode/public/js/scripts.js:41124 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/src/rhodecode.js:538 msgid "Lifetime" msgstr "Durée de vie" @@ -601,75 +702,75 @@ msgstr "Une erreur est survenue lors de la mise du gist {}: {}" 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/apps/home/views.py:218 rhodecode/apps/home/views.py:251 +#: rhodecode/apps/repository/views/repo_pull_requests.py:719 +#: rhodecode/templates/admin/my_account/my_account.mako:41 #: 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:580 +#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:150 +#: rhodecode/templates/base/base.mako:582 msgid "Repositories" msgstr "Dépôts" -#: rhodecode/apps/home/views.py:241 +#: rhodecode/apps/home/views.py:244 msgid "Groups" msgstr "Groupes" -#: rhodecode/apps/home/views.py:261 +#: rhodecode/apps/home/views.py:264 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "Journal public" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 msgid "journal" msgstr "Journal" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 msgid "Bad captcha" msgstr "Mauvais captcha" -#: rhodecode/apps/login/views.py:281 +#: rhodecode/apps/login/views.py:288 msgid "You have successfully registered with RhodeCode" msgstr "Vous vous êtes enregistré sur RhodeCode avec succès" -#: rhodecode/apps/login/views.py:317 +#: rhodecode/apps/login/views.py:325 msgid "If such email exists, a password reset link was sent to it." 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 +#: rhodecode/apps/login/views.py:331 msgid "Password reset has been disabled." msgstr "La réinitialisation du mot de passe est désactivée." -#: rhodecode/apps/login/views.py:412 +#: rhodecode/apps/login/views.py:420 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:428 msgid "" "Your password reset was successful, a new password has been sent to your " "email" 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 +#: rhodecode/apps/my_account/views/my_account.py:135 msgid "Error occurred during update of user password" 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 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "Mot de passe modifié avec succès" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:288 msgid "Email successfully deleted" msgstr "Courriel supprimé avec succès" -#: rhodecode/apps/my_account/views/my_account.py:465 +#: rhodecode/apps/my_account/views/my_account.py:470 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" @@ -684,7 +785,7 @@ 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 +#: rhodecode/apps/user_group/views/__init__.py:328 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -711,28 +812,28 @@ msgstr "Une erreur est survenue durant l’invalidation du cache." #: 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:585 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_commits.py:192 #: 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 +#: rhodecode/apps/repository/views/repo_checks.py:98 #, python-format msgid "Created repository %s from %s" msgstr "" -#: rhodecode/apps/repository/views/repo_checks.py:104 +#: rhodecode/apps/repository/views/repo_checks.py:107 #, 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 +#: rhodecode/apps/repository/views/repo_checks.py:110 #, python-format msgid "Created repository %s" msgstr "" @@ -761,13 +862,13 @@ msgstr "Elargir le contexte" 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 +#: rhodecode/apps/repository/views/repo_commits.py:388 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1129 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:433 +#: rhodecode/apps/repository/views/repo_commits.py:432 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -849,14 +950,14 @@ 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/apps/repository/views/repo_summary.py:322 +#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 #: 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 +#: rhodecode/model/scm.py:804 rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "Tags" @@ -917,12 +1018,12 @@ msgid "" "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 +#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "Comparer le fork" -#: rhodecode/apps/repository/views/repo_forks.py:250 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s." @@ -931,91 +1032,88 @@ msgstr "Une erreur est survenue durant le fork du dépôt %s." msgid "Repository permissions updated" msgstr "Les permissions du dépôt ont été mises à jour" -#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +#: rhodecode/apps/repository/views/repo_pull_requests.py:615 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:750 msgid "Error creating pull request: {}" msgstr "Erreur à la création du pull request: {}" -#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +#: rhodecode/apps/repository/views/repo_pull_requests.py:775 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +#: rhodecode/apps/repository/views/repo_pull_requests.py:790 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +#: rhodecode/apps/repository/views/repo_pull_requests.py:841 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:844 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:875 +#: rhodecode/apps/repository/views/repo_pull_requests.py:905 msgid "Cannot update closed pull requests." msgstr "Imposible de mettre à jour des pull requests clos." -#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +#: rhodecode/apps/repository/views/repo_pull_requests.py:911 msgid "Pull request title & description updated." msgstr "Titre et desccription du pull request mis à jour." -#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:946 msgid "Reload page" msgstr "Recharger la page" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1010 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1034 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1060 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 +#: rhodecode/apps/repository/views/repo_settings.py:168 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 msgid "Error occurred during update of repository {}" msgstr "Une erreur est survenue lors de la mise à jour du dépôt {}" -#: rhodecode/apps/repository/views/repo_settings.py:193 +#: rhodecode/apps/repository/views/repo_settings.py:194 msgid "Unlocked" msgstr "Débloqué" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:199 msgid "Locked" msgstr "Bloqué" -#: rhodecode/apps/repository/views/repo_settings.py:200 +#: rhodecode/apps/repository/views/repo_settings.py:201 #, 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.py:205 #: 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 +#: rhodecode/apps/repository/views/repo_settings.py:249 msgid "An error occurred during deletion of repository stats" msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt." @@ -1078,28 +1176,18 @@ msgstr "Dépôt bloqué" msgid "Unlocked repository" msgstr "Dépôt débloqué" -#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +#: rhodecode/apps/repository/views/repo_settings_fields.py:86 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 +#: rhodecode/apps/repository/views/repo_settings_fields.py:108 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 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86 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." @@ -1108,34 +1196,23 @@ msgstr "Les changements distants ont été récupérés." 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 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Branch" msgstr "Branche" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Tag" msgstr "Label" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:299 msgid "Bookmark" msgstr "Marque page" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:323 msgid "Closed branches" msgstr "Branches fermées" @@ -1147,41 +1224,41 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:209 +#: rhodecode/apps/user_group/views/__init__.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:231 +#: rhodecode/apps/user_group/views/__init__.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:257 +#: rhodecode/apps/user_group/views/__init__.py:232 msgid "Successfully deleted user group" msgstr "Suppression du groupe d'utilisateur réussie" -#: rhodecode/apps/user_group/views/__init__.py:262 +#: rhodecode/apps/user_group/views/__init__.py:237 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 +#: rhodecode/apps/user_group/views/__init__.py:341 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 +#: rhodecode/apps/user_group/views/__init__.py:356 msgid "User Group permissions updated" msgstr "Permissions du groupe d'utilisateurs mis à jour" -#: rhodecode/apps/user_group/views/__init__.py:452 +#: rhodecode/apps/user_group/views/__init__.py:428 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 +#: rhodecode/apps/user_group/views/__init__.py:510 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:538 +#: rhodecode/apps/user_group/views/__init__.py:514 msgid "An error occurred during synchronization update" msgstr "" @@ -1208,20 +1285,20 @@ msgstr "" msgid "Auth Cache TTL" msgstr "Durée de vie du cache d'authentification" -#: rhodecode/authentication/views.py:90 +#: rhodecode/authentication/views.py:93 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:170 msgid "Auth settings updated successfully." msgstr "Paramètres d'authentification mis à jour avec succès." -#: rhodecode/authentication/views.py:181 +#: rhodecode/authentication/views.py:173 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "Il y a des erreurs à la sauvegarde des paramètres du plugin. Vérifiez vos entrées." -#: rhodecode/authentication/views.py:191 +#: rhodecode/authentication/views.py:181 msgid "Error occurred during update of auth settings." msgstr "Une erreur s'est produite pendant la mise à jour des paramètres d'authentification." @@ -1346,11 +1423,11 @@ msgid "Password to authenticate for given user DN." msgstr "Mot de passe pour authentifier l'utilisateur DN" #: rhodecode/authentication/plugins/auth_ldap.py:105 -#: rhodecode/integrations/types/webhook.py:214 +#: rhodecode/integrations/types/webhook.py:220 #: 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:324 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Mot de passe" @@ -1474,56 +1551,6 @@ msgstr "RhodeCode" msgid "Rhodecode Token Auth" msgstr "Jeton d'authentification RhodeCode" -#: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:286 -msgid "Error occurred during updating application settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:226 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:282 -msgid "Updated application settings" -msgstr "Réglages mis à jour" - -#: rhodecode/controllers/admin/settings.py:348 -msgid "Updated visualisation settings" -msgstr "Réglages d’affichage mis à jour." - -#: rhodecode/controllers/admin/settings.py:351 -msgid "Error occurred during updating visualisation settings" -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 "Entrez votre adresse de courriel SVP" - -#: rhodecode/controllers/admin/settings.py:462 -msgid "Send email task created" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:495 -msgid "Added new hook" -msgstr "Le nouveau hook a été ajouté." - -#: rhodecode/controllers/admin/settings.py:510 -msgid "Updated hooks" -msgstr "Hooks mis à jour" - -#: rhodecode/controllers/admin/settings.py:514 -msgid "Error occurred during hook creation" -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" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:648 -msgid "Updated Labs settings" -msgstr "" - #: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" @@ -1548,35 +1575,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:149 +#: rhodecode/events/repo.py:189 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:158 +#: rhodecode/events/repo.py:198 msgid "repository created" msgstr "Dépôt créé" -#: rhodecode/events/repo.py:167 +#: rhodecode/events/repo.py:207 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:176 +#: rhodecode/events/repo.py:216 msgid "repository deleted" msgstr "Dépôt supprimé" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:256 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:265 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:274 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:285 msgid "repository push" msgstr "" @@ -1627,7 +1654,7 @@ msgstr "" #: 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:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:215 #: 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 @@ -1655,9 +1682,9 @@ msgstr "Réinitialiser" #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: 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/changeset/changeset_file_comment.mako:143 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:148 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1720,81 +1747,81 @@ msgstr "" msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:302 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:327 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:214 +#: rhodecode/integrations/types/email.py:215 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:215 +#: rhodecode/integrations/types/email.py:216 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:220 #: rhodecode/integrations/types/email.py:221 +#: rhodecode/integrations/types/email.py:222 msgid "Email address" msgstr "Adresse e-mail" -#: rhodecode/integrations/types/email.py:233 +#: rhodecode/integrations/types/email.py:234 msgid "Send repo push summaries to a list of recipients via email" msgstr "" -#: rhodecode/integrations/types/hipchat.py:43 +#: rhodecode/integrations/types/hipchat.py:41 msgid "Yellow" msgstr "" -#: rhodecode/integrations/types/hipchat.py:44 +#: rhodecode/integrations/types/hipchat.py:42 msgid "Red" msgstr "" -#: rhodecode/integrations/types/hipchat.py:45 +#: rhodecode/integrations/types/hipchat.py:43 msgid "Green" msgstr "" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Purple" msgstr "" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Gray" msgstr "" -#: rhodecode/integrations/types/hipchat.py:52 +#: rhodecode/integrations/types/hipchat.py:50 msgid "Hipchat server URL" msgstr "" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:51 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:63 +#: rhodecode/integrations/types/hipchat.py:61 msgid "Notify" msgstr "" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:62 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:70 +#: rhodecode/integrations/types/hipchat.py:68 msgid "Color" msgstr "" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:69 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:99 +#: rhodecode/integrations/types/hipchat.py:97 msgid "Hipchat" msgstr "" -#: rhodecode/integrations/types/hipchat.py:100 +#: rhodecode/integrations/types/hipchat.py:98 msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" @@ -1810,7 +1837,7 @@ msgid "" msgstr "" #: rhodecode/integrations/types/slack.py:60 -#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/integrations/types/webhook.py:210 #: 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 @@ -1821,7 +1848,7 @@ msgstr "" #: 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:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1857,11 +1884,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:177 +#: rhodecode/integrations/types/webhook.py:183 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:185 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 " @@ -1869,53 +1896,53 @@ msgid "" "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:199 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:194 +#: rhodecode/integrations/types/webhook.py:200 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 +#: rhodecode/integrations/types/webhook.py:211 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:215 +#: rhodecode/integrations/types/webhook.py:221 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:225 +#: rhodecode/integrations/types/webhook.py:231 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:226 +#: rhodecode/integrations/types/webhook.py:232 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:235 +#: rhodecode/integrations/types/webhook.py:241 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:236 +#: rhodecode/integrations/types/webhook.py:242 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:245 +#: rhodecode/integrations/types/webhook.py:251 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:246 +#: rhodecode/integrations/types/webhook.py:252 msgid "Select if the Webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:259 +#: rhodecode/integrations/types/webhook.py:265 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:260 +#: rhodecode/integrations/types/webhook.py:266 msgid "Post json events to a Webhook endpoint" msgstr "" @@ -2003,80 +2030,63 @@ msgstr "[suit maintenant] le dépôt" msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/action_parser.py:171 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/action_parser.py:189 +#: rhodecode/lib/action_parser.py:191 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "Requête de pull #%s" -#: rhodecode/lib/action_parser.py:223 +#: rhodecode/lib/action_parser.py:226 #, python-format msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:228 +#: rhodecode/lib/action_parser.py:231 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/action_parser.py:235 +#: rhodecode/lib/action_parser.py:238 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:288 +#: rhodecode/lib/action_parser.py:293 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/action_parser.py:291 +#: rhodecode/lib/action_parser.py:296 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/action_parser.py:304 +#: rhodecode/lib/action_parser.py:309 msgid "Commit not found" msgstr "Révision non trouvée" -#: rhodecode/lib/auth.py:1445 +#: rhodecode/lib/auth.py:1441 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1535 +#: rhodecode/lib/auth.py:1531 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:1577 +#: rhodecode/lib/auth.py:1575 msgid "You need to be signed in to view this page" msgstr "Vous devez vous connecter pour voir cette page" -#: rhodecode/lib/diffs.py:62 -msgid "Click to comment" -msgstr "Cliquer pour commenter" - -#: rhodecode/lib/diffs.py:77 -msgid "Binary file" -msgstr "Fichier binaire" - -#: rhodecode/lib/diffs.py:98 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Cet ensemble de changements était trop gros pour être affiché et a été découpé, utilisez le menu « Diff » pour afficher les différences." - -#: rhodecode/lib/diffs.py:109 -msgid "No changes detected" -msgstr "Aucun changement détecté." - -#: rhodecode/lib/diffs.py:927 +#: rhodecode/lib/diffs.py:864 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1869 +#: rhodecode/lib/helpers.py:1855 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2096,7 +2106,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1893 +#: rhodecode/lib/helpers.py:1879 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2110,49 +2120,49 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1910 +#: rhodecode/lib/helpers.py:1896 #, 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:525 +#: rhodecode/lib/utils2.py:524 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:531 +#: rhodecode/lib/utils2.py:530 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:540 +#: rhodecode/lib/utils2.py:539 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:542 +#: rhodecode/lib/utils2.py:541 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:544 +#: rhodecode/lib/utils2.py:543 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:546 +#: rhodecode/lib/utils2.py:545 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:548 +#: rhodecode/lib/utils2.py:547 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:550 +#: rhodecode/lib/utils2.py:549 msgid "in ${val} and ${detail}" msgstr "" -#: 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/lib/utils2.py:553 +#: rhodecode/public/js/rhodecode-components.js:30702 +#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "à l’instant" @@ -2180,6 +2190,7 @@ msgstr "à l’instant" #: 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_11_0_0.py:2599 #: 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 @@ -2188,7 +2199,7 @@ msgstr "à l’instant" #: 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 +#: rhodecode/model/db.py:2626 msgid "Repository no access" msgstr "Aucun accès au dépôt" @@ -2215,6 +2226,7 @@ msgstr "Aucun accès au dépôt" #: 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_11_0_0.py:2600 #: 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 @@ -2223,7 +2235,7 @@ msgstr "Aucun accès au dépôt" #: 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 +#: rhodecode/model/db.py:2627 msgid "Repository read access" msgstr "Accès en lecture au dépôt" @@ -2250,6 +2262,7 @@ msgstr "Accès en lecture au dépôt" #: 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_11_0_0.py:2601 #: 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 @@ -2258,7 +2271,7 @@ msgstr "Accès en lecture au dépôt" #: 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 +#: rhodecode/model/db.py:2628 msgid "Repository write access" msgstr "Accès en écriture au dépôt" @@ -2285,6 +2298,7 @@ msgstr "Accès en écriture au dépôt" #: 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_11_0_0.py:2602 #: 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 @@ -2293,7 +2307,7 @@ msgstr "Accès en écriture au dépôt" #: 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 +#: rhodecode/model/db.py:2629 msgid "Repository admin access" msgstr "Accès administrateur au dépôt" @@ -2360,6 +2374,7 @@ msgstr "Administrateur RhodeCode" #: 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_11_0_0.py:2620 #: 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 @@ -2368,7 +2383,7 @@ msgstr "Administrateur RhodeCode" #: 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 +#: rhodecode/model/db.py:2647 msgid "Repository creation disabled" msgstr "Création de dépôt désactivée" @@ -2395,6 +2410,7 @@ msgstr "Création de dépôt désactivée" #: 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_11_0_0.py:2621 #: 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 @@ -2403,7 +2419,7 @@ msgstr "Création de dépôt désactivée" #: 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 +#: rhodecode/model/db.py:2648 msgid "Repository creation enabled" msgstr "Création de dépôt activée" @@ -2430,6 +2446,7 @@ msgstr "Création de dépôt activée" #: 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_11_0_0.py:2625 #: 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 @@ -2438,7 +2455,7 @@ msgstr "Création de dépôt activée" #: 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 +#: rhodecode/model/db.py:2652 msgid "Repository forking disabled" msgstr "Fork de dépôt désactivé" @@ -2465,6 +2482,7 @@ msgstr "Fork de dépôt désactivé" #: 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_11_0_0.py:2626 #: 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 @@ -2473,7 +2491,7 @@ msgstr "Fork de dépôt désactivé" #: 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 +#: rhodecode/model/db.py:2653 msgid "Repository forking enabled" msgstr "Fork de dépôt activé" @@ -2521,6 +2539,7 @@ msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" #: 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_11_0_0.py:3328 #: 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 @@ -2529,7 +2548,11 @@ msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" #: 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 +#: rhodecode/model/db.py:3355 +#: rhodecode/public/js/rhodecode-components.js:48211 +#: rhodecode/public/js/scripts.js:40015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "Not Reviewed" msgstr "Pas encore relue" @@ -2556,6 +2579,7 @@ msgstr "Pas encore relue" #: 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_11_0_0.py:3329 #: 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 @@ -2564,7 +2588,7 @@ msgstr "Pas encore relue" #: 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 +#: rhodecode/model/db.py:3356 msgid "Approved" msgstr "Approuvée " @@ -2591,6 +2615,7 @@ msgstr "Approuvée " #: 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_11_0_0.py:3330 #: 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 @@ -2599,7 +2624,7 @@ msgstr "Approuvée " #: 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 +#: rhodecode/model/db.py:3357 msgid "Rejected" msgstr "Rejetée" @@ -2626,6 +2651,7 @@ msgstr "Rejetée" #: 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_11_0_0.py:3331 #: 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 @@ -2634,7 +2660,7 @@ msgstr "Rejetée" #: 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 +#: rhodecode/model/db.py:3358 msgid "Under Review" msgstr "En cours de relecture" @@ -2658,6 +2684,7 @@ msgstr "En cours de relecture" #: 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_11_0_0.py:2604 #: 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 @@ -2666,7 +2693,7 @@ msgstr "En cours de relecture" #: 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 +#: rhodecode/model/db.py:2631 msgid "Repository group no access" msgstr "" @@ -2690,6 +2717,7 @@ msgstr "" #: 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_11_0_0.py:2605 #: 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 @@ -2698,7 +2726,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2632 msgid "Repository group read access" msgstr "" @@ -2722,6 +2750,7 @@ msgstr "" #: 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_11_0_0.py:2606 #: 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 @@ -2730,7 +2759,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2633 msgid "Repository group write access" msgstr "" @@ -2754,6 +2783,7 @@ msgstr "" #: 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_11_0_0.py:2607 #: 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 @@ -2762,7 +2792,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2634 msgid "Repository group admin access" msgstr "" @@ -2785,6 +2815,7 @@ msgstr "" #: 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_11_0_0.py:2609 #: 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 @@ -2793,7 +2824,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2636 msgid "User group no access" msgstr "" @@ -2816,6 +2847,7 @@ msgstr "" #: 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_11_0_0.py:2610 #: 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 @@ -2824,7 +2856,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2637 msgid "User group read access" msgstr "" @@ -2847,6 +2879,7 @@ msgstr "" #: 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_11_0_0.py:2611 #: 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 @@ -2855,7 +2888,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2638 msgid "User group write access" msgstr "" @@ -2878,6 +2911,7 @@ msgstr "" #: 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_11_0_0.py:2612 #: 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 @@ -2886,7 +2920,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2639 msgid "User group admin access" msgstr "" @@ -2909,6 +2943,7 @@ msgstr "" #: 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_11_0_0.py:2614 #: 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 @@ -2917,7 +2952,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2641 msgid "Repository Group creation disabled" msgstr "" @@ -2940,6 +2975,7 @@ msgstr "" #: 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_11_0_0.py:2615 #: 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 @@ -2948,7 +2984,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2642 msgid "Repository Group creation enabled" msgstr "" @@ -2971,6 +3007,7 @@ msgstr "" #: 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_11_0_0.py:2617 #: 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 @@ -2979,7 +3016,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2644 msgid "User Group creation disabled" msgstr "" @@ -3002,6 +3039,7 @@ msgstr "" #: 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_11_0_0.py:2618 #: 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 @@ -3010,7 +3048,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2645 msgid "User Group creation enabled" msgstr "" @@ -3033,6 +3071,7 @@ msgstr "" #: 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_11_0_0.py:2628 #: 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 @@ -3041,7 +3080,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2655 msgid "Registration disabled" msgstr "" @@ -3064,6 +3103,7 @@ msgstr "" #: 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_11_0_0.py:2629 #: 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 @@ -3072,7 +3112,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2656 msgid "User Registration with manual account activation" msgstr "" @@ -3095,6 +3135,7 @@ msgstr "" #: 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_11_0_0.py:2630 #: 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 @@ -3103,7 +3144,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2657 msgid "User Registration with automatic account activation" msgstr "" @@ -3126,6 +3167,7 @@ msgstr "" #: 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_11_0_0.py:2636 #: 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 @@ -3134,7 +3176,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2663 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "" @@ -3157,6 +3199,7 @@ msgstr "" #: 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_11_0_0.py:2637 #: 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 @@ -3165,7 +3208,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2664 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "" @@ -3182,6 +3225,7 @@ msgstr "" #: 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_11_0_0.py:2622 #: 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 @@ -3190,7 +3234,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2649 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3208,6 +3252,7 @@ msgstr "" #: 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_11_0_0.py:2623 #: 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 @@ -3216,7 +3261,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2650 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3231,6 +3276,7 @@ msgstr "" #: 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_11_0_0.py:2597 #: 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 @@ -3239,7 +3285,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2624 msgid "RhodeCode Super Administrator" msgstr "" @@ -3251,6 +3297,7 @@ msgstr "" #: 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_11_0_0.py:2639 #: 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 @@ -3259,7 +3306,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2666 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3271,6 +3318,7 @@ msgstr "" #: 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_11_0_0.py:2640 #: 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 @@ -3279,10 +3327,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2667 msgid "Inherit object permissions from default user enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 #: 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 @@ -3291,10 +3340,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: 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 +#: rhodecode/model/db.py:1107 msgid "all" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3303,10 +3353,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: 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 +#: rhodecode/model/db.py:1108 msgid "http/web interface" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3315,10 +3366,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: 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 +#: rhodecode/model/db.py:1109 msgid "vcs (git/hg/svn protocol)" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3327,10 +3379,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: 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 +#: rhodecode/model/db.py:1110 msgid "api calls" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 #: 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 @@ -3339,10 +3392,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:1111 msgid "feed access" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 #: 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 @@ -3351,60 +3405,51 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2387 msgid "No parent" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 #: 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 +#: rhodecode/model/db.py:2659 msgid "Password reset enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 #: 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 +#: rhodecode/model/db.py:2660 msgid "Password reset hidden" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 #: 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 +#: rhodecode/model/db.py:2661 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:150 -msgid "Invalid search query. Try quoting it." -msgstr "Requête invalide. Essayer de la mettre entre guillemets." - -#: rhodecode/lib/index/whoosh.py:152 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de code Whoosh." - -#: rhodecode/lib/index/whoosh.py:157 -msgid "An error occurred during this search operation" -msgstr "Une erreur est survenue durant l’opération de recherche." - -#: rhodecode/lib/index/whoosh.py:165 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:166 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" @@ -3424,28 +3469,28 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:382 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:376 +#: rhodecode/model/comment.py:383 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:87 +#: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "Veuillez entrer un identifiant" -#: rhodecode/model/forms.py:88 +#: rhodecode/model/forms.py:89 #, 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:98 +#: rhodecode/model/forms.py:99 msgid "Please enter a password" msgstr "Veuillez entrer un mot de passe" -#: rhodecode/model/forms.py:99 +#: rhodecode/model/forms.py:100 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entrez au moins %(min)i caractères" @@ -3532,8 +3577,8 @@ msgstr "Lire" #: 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 -#: rhodecode/templates/changeset/changeset_file_comment.mako:321 +#: rhodecode/templates/changeset/changeset_file_comment.mako:272 +#: rhodecode/templates/changeset/changeset_file_comment.mako:322 msgid "Write" msgstr "Écrire" @@ -3567,8 +3612,8 @@ 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:417 -#: rhodecode/templates/base/base.mako:424 +#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:426 msgid "Admin" msgstr "Administration" @@ -3685,115 +3730,79 @@ msgid "" "This pull request cannot be updated because the source reference is missing." 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 +#: rhodecode/model/pull_request.py:1218 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1168 +#: rhodecode/model/pull_request.py:1220 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1181 +#: rhodecode/model/pull_request.py:1233 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1200 +#: rhodecode/model/pull_request.py:1252 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1203 +#: rhodecode/model/pull_request.py:1255 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 +#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 msgid "Bookmarks" msgstr "Signets" -#: rhodecode/model/pull_request.py:1370 +#: rhodecode/model/pull_request.py:1425 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1373 +#: rhodecode/model/pull_request.py:1428 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1533 +#: rhodecode/model/pull_request.py:1588 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1546 +#: rhodecode/model/pull_request.py:1601 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1561 +#: rhodecode/model/pull_request.py:1616 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1564 +#: rhodecode/model/pull_request.py:1619 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1599 +#: rhodecode/model/pull_request.py:1654 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1604 +#: rhodecode/model/pull_request.py:1659 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1611 +#: rhodecode/model/pull_request.py:1666 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1613 +#: rhodecode/model/pull_request.py:1668 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:762 +#: rhodecode/model/scm.py:775 msgid "latest tip" msgstr "Dernier sommet" -#: rhodecode/model/user.py:166 -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:333 -#, python-format -msgid "" -"You can't edit this user (`%(username)s`) since it's crucial for entire " -"application" -msgstr "" - -#: 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: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: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:532 -#, python-format -msgid "" -"user \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups:%s" -msgstr "" - -#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99 +#: rhodecode/model/validators.py:92 rhodecode/model/validators.py:93 msgid "Value cannot be an empty list" msgstr "Cette valeur ne peut être une liste vide." -#: rhodecode/model/validators.py:142 +#: rhodecode/model/validators.py:139 msgid "Pattern already exists" msgstr "" @@ -3814,30 +3823,26 @@ msgid "" "dashes and must begin with alphanumeric character or underscore" msgstr "" -#: rhodecode/model/validators.py:192 -msgid "The input is not valid" -msgstr "" - -#: rhodecode/model/validators.py:199 +#: rhodecode/model/validators.py:195 #, python-format msgid "Username %(username)s is not valid" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide." -#: rhodecode/model/validators.py:200 +#: rhodecode/model/validators.py:196 #, python-format msgid "Username %(username)s is disabled" msgstr "" -#: rhodecode/model/validators.py:223 +#: rhodecode/model/validators.py:221 msgid "Invalid user group name" msgstr "" -#: rhodecode/model/validators.py:224 +#: rhodecode/model/validators.py:222 #, python-format msgid "User group `%(usergroup)s` already exists" msgstr "" -#: rhodecode/model/validators.py:226 +#: rhodecode/model/validators.py:224 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -3865,166 +3870,166 @@ msgstr "" msgid "no permission to store repository group in root location" msgstr "" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:387 msgid "Invalid characters (non-ascii) in password" msgstr "Caractères incorrects (non-ASCII) dans le mot de passe." -#: rhodecode/model/validators.py:401 -msgid "Invalid old password" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:406 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas." -#: rhodecode/model/validators.py:436 +#: rhodecode/model/validators.py:426 msgid "invalid password" msgstr "mot de passe invalide" -#: rhodecode/model/validators.py:437 +#: rhodecode/model/validators.py:427 msgid "invalid user name" msgstr "nom d’utilisateur invalide" -#: rhodecode/model/validators.py:438 +#: rhodecode/model/validators.py:428 msgid "Your account is disabled" msgstr "Votre compte est désactivé" -#: rhodecode/model/validators.py:470 -msgid "Token mismatch" -msgstr "Jeton d’authentification incorrect." - -#: rhodecode/model/validators.py:484 +#: rhodecode/model/validators.py:464 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé." -#: rhodecode/model/validators.py:486 +#: rhodecode/model/validators.py:466 #, python-format msgid "Repository with name %(repo)s already exists" msgstr "" -#: rhodecode/model/validators.py:488 +#: rhodecode/model/validators.py:468 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:491 +#: rhodecode/model/validators.py:471 #, python-format msgid "Repository with name %(repo)s exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:493 +#: rhodecode/model/validators.py:473 #, python-format msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:566 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219 msgid "Repository name cannot end with .git" msgstr "" -#: rhodecode/model/validators.py:640 +#: rhodecode/model/validators.py:626 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "" -#: rhodecode/model/validators.py:641 +#: rhodecode/model/validators.py:627 #, python-format msgid "" "Invalid clone url, provide a valid clone url starting with one of " "%(allowed_prefixes)s" msgstr "" -#: rhodecode/model/validators.py:670 +#: rhodecode/model/validators.py:659 msgid "Fork have to be the same type as parent" msgstr "Le fork doit être du même type que le parent." -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:676 msgid "You do not have the permission to create repositories in this group." msgstr "" -#: rhodecode/model/validators.py:688 +#: rhodecode/model/validators.py:679 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "" "You do not have the permission to store repositories in the root location." msgstr "" -#: rhodecode/model/validators.py:748 +#: rhodecode/model/validators.py:739 msgid "This username or user group name is not valid" msgstr "" -#: rhodecode/model/validators.py:879 +#: rhodecode/model/validators.py:852 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: rhodecode/model/validators.py:894 +#: rhodecode/model/validators.py:870 msgid "This e-mail address is already taken" msgstr "Cette adresse e-mail est déjà enregistrée" -#: rhodecode/model/validators.py:914 +#: rhodecode/model/validators.py:892 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "L’adresse e-mail « %(email)s » n’existe pas" -#: rhodecode/model/validators.py:935 +#: rhodecode/model/validators.py:913 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "Les révisions %(revs)s font déjà partie de la requête de pull ou on des statuts définis." -#: rhodecode/model/validators.py:966 -#: rhodecode/model/validation_schema/validators.py:40 -#: rhodecode/model/validation_schema/validators.py:53 +#: rhodecode/model/validators.py:946 +#: rhodecode/model/validation_schema/validators.py:41 +#: rhodecode/model/validation_schema/validators.py:54 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:967 +#: rhodecode/model/validators.py:947 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:994 +#: rhodecode/model/validators.py:975 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: rhodecode/model/validators.py:1009 +#: rhodecode/model/validators.py:992 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: rhodecode/model/validators.py:1012 +#: rhodecode/model/validators.py:995 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "" -#: rhodecode/model/validators.py:1015 +#: rhodecode/model/validators.py:998 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validators.py:1017 +#: rhodecode/model/validators.py:1000 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validation_schema/validators.py:61 +#: rhodecode/model/validators.py:1068 +msgid "Url must start with http or /" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:62 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:70 +#: rhodecode/model/validation_schema/validators.py:71 msgid "Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/validators.py:132 +#: rhodecode/model/validation_schema/validators.py:133 msgid "" "Invalid clone url, provide a valid clone url starting with one of " "{allowed_prefixes}" msgstr "" -#: rhodecode/model/validation_schema/validators.py:138 +#: rhodecode/model/validation_schema/validators.py:139 msgid "invalid clone url for {repo_type} repository" msgstr "" +#: rhodecode/model/validation_schema/validators.py:148 +msgid "Please enter a valid json object" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -4073,35 +4078,35 @@ msgstr "" msgid "Integration scope" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 msgid "General integration options" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 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:113 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: 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:136 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4141,451 +4146,451 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: 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/rhodecode-components.js:28706 +#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: 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/rhodecode-components.js:30637 +#: rhodecode/public/js/scripts.js:22485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: 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/rhodecode-components.js:30638 +#: rhodecode/public/js/scripts.js:22486 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: 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/rhodecode-components.js:30639 +#: rhodecode/public/js/scripts.js:22487 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: 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/rhodecode-components.js:30640 +#: rhodecode/public/js/scripts.js:22488 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: 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/rhodecode-components.js:30641 +#: rhodecode/public/js/scripts.js:22489 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: 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/rhodecode-components.js:30642 +#: rhodecode/public/js/scripts.js:22490 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: 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/rhodecode-components.js:30662 +#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: 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/rhodecode-components.js:30670 +#: rhodecode/public/js/scripts.js:22518 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: 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/rhodecode-components.js:30682 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: 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/rhodecode-components.js:30684 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: 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/rhodecode-components.js:30688 +#: rhodecode/public/js/scripts.js:22536 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: 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/rhodecode-components.js:30690 +#: rhodecode/public/js/scripts.js:22538 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: 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/rhodecode-components.js:30692 +#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: 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-components.js:44751 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: 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-components.js:44754 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: 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-components.js:44757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: 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-components.js:44760 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: 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-components.js:44764 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: 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:43213 -#: rhodecode/public/js/scripts.js:35061 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:44766 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: 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:43218 -#: rhodecode/public/js/scripts.js:35066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:44771 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: 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-components.js:44773 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: 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-components.js:44778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: 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-components.js:44780 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: 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-components.js:44784 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: 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-components.js:44786 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: 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/rhodecode-components.js:45724 +#: rhodecode/public/js/scripts.js:37528 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: 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/rhodecode-components.js:45726 +#: rhodecode/public/js/scripts.js:37530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: 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/rhodecode-components.js:46172 +#: rhodecode/public/js/scripts.js:37976 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: 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/rhodecode-components.js:46191 +#: rhodecode/public/js/scripts.js:37995 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: 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/rhodecode-components.js:46210 +#: rhodecode/public/js/scripts.js:38014 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:44673 -#: rhodecode/public/js/scripts.js:36521 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:46230 +#: rhodecode/public/js/scripts.js:38034 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: 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/rhodecode-components.js:46597 +#: rhodecode/public/js/scripts.js:38401 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: 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/rhodecode-components.js:46681 +#: rhodecode/public/js/scripts.js:38485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: 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/rhodecode-components.js:46696 +#: rhodecode/public/js/scripts.js:38500 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: 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:45296 -#: rhodecode/public/js/scripts.js:37144 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:46853 +#: rhodecode/public/js/scripts.js:38657 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Envoi…" -#: 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/rhodecode-components.js:46904 +#: rhodecode/public/js/scripts.js:38708 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: 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:45452 -#: rhodecode/public/js/scripts.js:37300 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:538 +#: rhodecode/public/js/rhodecode-components.js:47014 +#: rhodecode/public/js/scripts.js:38818 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/comments.js:543 msgid "Delete this comment?" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47084 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:613 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47161 +#: rhodecode/public/js/scripts.js:38965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode/comments.js:690 msgid "Leave a comment on line {0}." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47275 +#: rhodecode/public/js/scripts.js:39079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/comments.js:804 msgid "TODO from comment {0} was fixed." msgstr "" -#: 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/rhodecode-components.js:47455 +#: rhodecode/public/js/scripts.js:39259 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: 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/rhodecode-components.js:47457 +#: rhodecode/public/js/scripts.js:39261 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: 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/rhodecode-components.js:47466 +#: rhodecode/public/js/scripts.js:39270 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: 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/rhodecode-components.js:47601 +#: rhodecode/public/js/scripts.js:39405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Lien vers la sélection" -#: 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/rhodecode-components.js:47641 +#: rhodecode/public/js/scripts.js:39445 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: 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:46106 -#: rhodecode/public/js/scripts.js:37954 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/rhodecode-components.js:47642 +#: rhodecode/public/js/scripts.js:39446 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: 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/rhodecode-components.js:47651 +#: rhodecode/public/js/scripts.js:39455 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: 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:46116 -#: rhodecode/public/js/scripts.js:37964 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode-components.js:47652 +#: rhodecode/public/js/scripts.js:39456 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: 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/rhodecode-components.js:48032 +#: rhodecode/public/js/scripts.js:39836 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: 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:46510 -#: rhodecode/public/js/scripts.js:38358 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:48041 +#: rhodecode/public/js/scripts.js:39845 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48046 +#: rhodecode/public/js/scripts.js:39850 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: 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/rhodecode-components.js:48052 +#: rhodecode/public/js/scripts.js:39856 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48068 +#: rhodecode/public/js/scripts.js:39872 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46530 -#: rhodecode/public/js/scripts.js:38378 +#: rhodecode/public/js/rhodecode-components.js:48075 +#: rhodecode/public/js/scripts.js:39879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48082 +#: rhodecode/public/js/scripts.js:39886 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48096 +#: rhodecode/public/js/scripts.js:39900 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48198 +#: rhodecode/public/js/scripts.js:40002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:300 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46823 -#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode-components.js:48204 +#: rhodecode/public/js/scripts.js:40008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +msgid "User `{0}` already in reviewers" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48334 +#: rhodecode/public/js/scripts.js:40138 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:436 msgid "added manually by \"{0}\"" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48338 +#: rhodecode/public/js/scripts.js:40142 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:440 msgid "member of \"{0}\"" msgstr "" -#: 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/rhodecode-components.js:48924 +#: rhodecode/public/js/scripts.js:40728 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: 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/rhodecode-components.js:48944 +#: rhodecode/public/js/scripts.js:40748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: 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 +#: rhodecode/public/js/rhodecode-components.js:49356 +#: rhodecode/public/js/scripts.js:41160 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode.js:574 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 +#: rhodecode/public/js/rhodecode-components.js:49364 +#: rhodecode/public/js/scripts.js:41168 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/src/rhodecode.js:582 msgid "Specified expiration date" msgstr "" @@ -4594,174 +4599,180 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:488 -#: rhodecode/templates/codeblocks/diffs.mako:493 +#: rhodecode/templates/codeblocks/diffs.mako:494 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Add another comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 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/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No branches available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No forks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No gists available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No repositories available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No repository groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 msgid "No ssh keys available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 msgid "No tags available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 msgid "No user groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No users available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: 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:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "Désactivé" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "Activé" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "files" msgstr "Fichiers" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "Chargement…" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "specify commit" msgstr "Spécifier un commit" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} days" msgstr "{0} jours" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 msgid "{0} hours" msgstr "{0} heures" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 msgid "{0} months" msgstr "{0} mois" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 msgid "{0} out of {1} ssh keys" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 msgid "{0} years" msgstr "{0} années" @@ -4835,12 +4846,17 @@ msgstr "Vous avez les droits d'administration sur ce groupe, et vous pouvez l'é msgid "Edit Repository Group" msgstr "Editer le groupe de dépôts" -#: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:68 +msgid "No repositories or repositories groups exists here." +msgstr "" + +#: rhodecode/templates/index_base.mako:86 +#: rhodecode/templates/index_base.mako:116 #: rhodecode/templates/admin/gists/index.mako:112 #: 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_user_group_membership.mako:39 #: 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 @@ -4857,13 +4873,14 @@ msgstr "Editer le groupe de dépôts" msgid "Name" msgstr "Nom" -#: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/index_base.mako:89 +#: rhodecode/templates/index_base.mako:119 #: 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/my_account/my_account_user_group_membership.mako:44 #: 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:55 @@ -4893,20 +4910,21 @@ msgstr "Nom" #: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 -#: rhodecode/templates/summary/components.mako:82 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "Description" -#: rhodecode/templates/index_base.mako:103 -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:92 +#: rhodecode/templates/index_base.mako:122 #: 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/index_base.mako:94 +#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 @@ -4918,11 +4936,11 @@ msgstr "Dernière modification" #: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:68 -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:209 msgid "Owner" msgstr "Propriétaire" -#: rhodecode/templates/index_base.mako:134 +#: rhodecode/templates/index_base.mako:125 #: 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 @@ -4934,7 +4952,7 @@ msgstr "Propriétaire" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4951,7 +4969,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:341 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:343 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Connexion" @@ -4975,7 +4993,7 @@ msgstr "" #: rhodecode/templates/login.mako:68 #: rhodecode/templates/password_reset.mako:37 -#: rhodecode/templates/base/base.mako:46 +#: rhodecode/templates/base/base.mako:48 #: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "" @@ -5130,7 +5148,7 @@ msgid "Repository" msgstr "Dépôt" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:77 msgid "Admin audit logs" msgstr "" @@ -5317,7 +5335,7 @@ 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/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 @@ -5391,7 +5409,7 @@ msgstr "" #: 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:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5494,8 +5512,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: 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:249 +#: rhodecode/templates/base/base.mako:86 +#: rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "Options" @@ -5598,7 +5616,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:355 +#: rhodecode/templates/base/base.mako:357 msgid "My account" msgstr "Mon compte" @@ -5626,35 +5644,40 @@ msgstr "" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:36 -msgid "OAuth Identities" +#: rhodecode/templates/admin/my_account/my_account.mako:33 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 +msgid "User Group Membership" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:38 +msgid "OAuth Identities" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "Watched" msgstr "Surveillé" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:43 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 -#: rhodecode/templates/base/base.mako:239 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:44 #: 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 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:82 msgid "Permissions" msgstr "Permissions" -#: rhodecode/templates/admin/my_account/my_account.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:45 msgid "Live Notifications" msgstr "" @@ -5880,6 +5903,23 @@ msgid "" "sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +msgid "Click add to use this generate SSH key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 +#: 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: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 +#: rhodecode/templates/admin/users/users.mako:74 +msgid "Active" +msgstr "Actif" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" @@ -6093,8 +6133,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:77 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:153 msgid "Repository groups" msgstr "" @@ -6283,7 +6323,7 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:196 +#: rhodecode/templates/base/base.mako:198 msgid "Clone from" msgstr "Cloner depuis" @@ -6363,7 +6403,7 @@ msgid "Remote" msgstr "Dépôt distant" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:143 +#: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "Statistiques" @@ -6388,100 +6428,104 @@ msgstr "" msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Attached scoped tokens" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:25 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 msgid "Set" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40 msgid "Manually set this repository as a fork of another from the list" msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste." -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:49 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 msgid "" "All actions made on this repository will be visible to everyone following " "the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "" "Force repository locking. This only works when anonymous access is disabled." " Pulling from the repository locks the repository to that user until the " "same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 #: 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 ?" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 msgid "" "This repository will be renamed in a special way in order to make it " "inaccessible to RhodeCode Enterprise and its VCS systems. If you need to " @@ -6489,11 +6533,11 @@ msgid "" "rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" @@ -6541,17 +6585,6 @@ msgstr "" msgid "Key" 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: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 -#: rhodecode/templates/admin/users/users.mako:74 -msgid "Active" -msgstr "Actif" - #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" @@ -6713,7 +6746,7 @@ msgid "Settings for Repository: %s" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 -msgid "Non-changeable id" +msgid "permalink id" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 @@ -6908,7 +6941,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:210 +#: rhodecode/templates/admin/settings/settings_visual.mako:214 msgid "Save settings" msgstr "Enregister les options" @@ -7202,6 +7235,14 @@ msgstr "" msgid "Gunicorn process management" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:11 +msgid "start auto refresh" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:12 +msgid "stop auto refresh" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -7252,13 +7293,6 @@ msgstr "" msgid "Cleanup sessions" msgstr "" -#: rhodecode/templates/admin/settings/settings_supervisor_tail.mako:1 -#, python-format -msgid "" -"Last %(size)s bytes of process logs, use ?offset=[num] GET param to set " -"custom size" -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7414,24 +7448,26 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:170 -msgid "Clone URL" +msgid "Clone URL templates" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:179 +#: rhodecode/templates/admin/settings/settings_visual.mako:181 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" " {user} current user username,\n" +" {sys_user} current system user running this process, usefull for ssh,\n" +" {hostname} hostname of this server running RhodeCode,\n" " {netloc} network location/server host of running RhodeCode server,\n" " {repo} full repository name,\n" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:192 +#: rhodecode/templates/admin/settings/settings_visual.mako:196 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:200 +#: rhodecode/templates/admin/settings/settings_visual.mako:204 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7446,8 +7482,8 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:79 -#: rhodecode/templates/base/base.mako:154 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:156 msgid "User groups" msgstr "" @@ -7595,7 +7631,7 @@ msgstr "Ajouter un utilisateur" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:80 msgid "Users" msgstr "Utilisateurs" @@ -7859,13 +7895,17 @@ msgstr "" msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:25 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" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 +msgid "Use this generated key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +msgid "Confirmation required on the next screen" msgstr "" #: rhodecode/templates/admin/users/users.mako:5 @@ -7876,174 +7916,174 @@ msgstr "Administration des utilisateurs" msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:53 +#: rhodecode/templates/base/base.mako:55 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:83 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:83 +#: rhodecode/templates/base/base.mako:85 msgid "Defaults" msgstr "" -#: rhodecode/templates/base/base.mako:101 +#: rhodecode/templates/base/base.mako:103 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:188 +#: rhodecode/templates/base/base.mako:190 msgid "Fork of" msgstr "Fork de" -#: rhodecode/templates/base/base.mako:205 +#: rhodecode/templates/base/base.mako:207 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:210 +#: rhodecode/templates/base/base.mako:212 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:228 +#: rhodecode/templates/base/base.mako:230 #: 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/base/base.mako:231 #: 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/base/base.mako:232 #: 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:231 +#: rhodecode/templates/base/base.mako:233 #: 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:235 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:245 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Options" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: 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/base/base.mako:269 +#: rhodecode/templates/base/base.mako:413 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Rechercher" -#: rhodecode/templates/base/base.mako:271 +#: rhodecode/templates/base/base.mako:273 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:273 +#: rhodecode/templates/base/base.mako:275 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/base/base.mako:280 #: 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:279 +#: rhodecode/templates/base/base.mako:281 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:303 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:309 +#: rhodecode/templates/base/base.mako:311 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/base/base.mako:328 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:336 +#: rhodecode/templates/base/base.mako:338 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:338 +#: rhodecode/templates/base/base.mako:340 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:357 +#: rhodecode/templates/base/base.mako:359 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:361 +#: rhodecode/templates/base/base.mako:363 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:393 +#: rhodecode/templates/base/base.mako:395 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:396 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:15 msgid "Journal" msgstr "Historique" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:401 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:402 msgid "Public journal" msgstr "Journal public" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:407 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:408 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:412 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/base/base.mako:418 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:433 -#: rhodecode/templates/base/base.mako:434 +#: rhodecode/templates/base/base.mako:435 +#: rhodecode/templates/base/base.mako:436 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8065,15 +8105,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:491 +#: rhodecode/templates/base/base.mako:493 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:546 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:554 msgid "Site-wide shortcuts" msgstr "" @@ -8180,8 +8220,8 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:274 -#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:325 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8526,10 +8566,10 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changelog/changelog_elements.mako:121 #: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 -#: rhodecode/templates/summary/summary_commits.mako:62 +#: rhodecode/templates/summary/summary_commits.mako:68 #, python-format msgid "Bookmark %s" msgstr "" @@ -8548,10 +8588,10 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changelog/changelog_elements.mako:113 #: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 -#: rhodecode/templates/summary/summary_commits.mako:76 +#: rhodecode/templates/summary/summary_commits.mako:82 #, python-format msgid "Branch %s" msgstr "" @@ -8616,79 +8656,79 @@ msgstr "Il n’y a aucun changement pour le moment" msgid "load previous" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/summary/summary_commits.mako:21 +#: rhodecode/templates/changelog/changelog_elements.mako:32 +#: rhodecode/templates/summary/summary_commits.mako:27 #, python-format msgid "" "Commit status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/summary/summary_commits.mako:25 +#: rhodecode/templates/changelog/changelog_elements.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: {}" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/summary/summary_commits.mako:31 +#: rhodecode/templates/changelog/changelog_elements.mako:42 +#: rhodecode/templates/summary/summary_commits.mako:37 msgid "Commit status: Not Reviewed" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/summary/summary_commits.mako:36 +#: rhodecode/templates/changelog/changelog_elements.mako:47 +#: rhodecode/templates/summary/summary_commits.mako:42 msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changelog/changelog_elements.mako:58 #: rhodecode/templates/changeset/changeset.mako:42 msgid "Copy the full commit id" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changelog/changelog_elements.mako:65 #: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:72 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: rhodecode/templates/changeset/changeset.mako:50 #: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:72 #: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: 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/changelog/changelog_elements.mako:83 +#: rhodecode/templates/compare/compare_commits.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changelog/changelog_elements.mako:107 #: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "Fusion" -#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 -#: rhodecode/templates/summary/summary_commits.mako:69 +#: rhodecode/templates/summary/summary_commits.mako:75 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:137 +#: rhodecode/templates/changelog/changelog_elements.mako:143 msgid "load next" msgstr "" @@ -8723,7 +8763,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:81 +#: rhodecode/templates/changeset/changeset_file_comment.mako:82 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8739,8 +8779,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:445 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:451 +#: rhodecode/templates/codeblocks/diffs.mako:454 msgid "Raw diff" msgstr "" @@ -8757,8 +8797,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:452 -#: rhodecode/templates/codeblocks/diffs.mako:455 +#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:461 msgid "Download diff" msgstr "" @@ -8782,103 +8822,103 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:32 +#: rhodecode/templates/changeset/changeset_file_comment.mako:33 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:39 +#: rhodecode/templates/changeset/changeset_file_comment.mako:40 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:66 -#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:67 +#: rhodecode/templates/changeset/changeset_file_comment.mako:69 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:73 +#: rhodecode/templates/changeset/changeset_file_comment.mako:74 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:88 +#: rhodecode/templates/changeset/changeset_file_comment.mako:89 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 msgid "Pull request author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +#: rhodecode/templates/changeset/changeset_file_comment.mako:98 msgid "author" msgstr "Auteur" -#: rhodecode/templates/changeset/changeset_file_comment.mako:105 +#: rhodecode/templates/changeset/changeset_file_comment.mako:106 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:109 -#: rhodecode/templates/changeset/changeset_file_comment.mako:124 +#: rhodecode/templates/changeset/changeset_file_comment.mako:110 +#: rhodecode/templates/changeset/changeset_file_comment.mako:125 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:121 +#: rhodecode/templates/changeset/changeset_file_comment.mako:122 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:151 -#: rhodecode/templates/changeset/changeset_file_comment.mako:154 +#: rhodecode/templates/changeset/changeset_file_comment.mako:152 +#: rhodecode/templates/changeset/changeset_file_comment.mako:155 msgid "Prev" msgstr "Précédent" -#: rhodecode/templates/changeset/changeset_file_comment.mako:152 -#: rhodecode/templates/changeset/changeset_file_comment.mako:155 +#: rhodecode/templates/changeset/changeset_file_comment.mako:153 +#: rhodecode/templates/changeset/changeset_file_comment.mako:156 msgid "Next" msgstr "Suivant" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:191 msgid "Leave a comment on this Pull Request." msgstr "Laisser un commentaire sur ce Pull Request" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:193 msgid "Leave a comment on {} commits in this range." msgstr "Laisser un commentaire sur les {} révisions dans cette plage." -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:195 msgid "Leave a comment on this Commit." msgstr "Laisser un commentaire sur cette révision." -#: rhodecode/templates/changeset/changeset_file_comment.mako:282 +#: rhodecode/templates/changeset/changeset_file_comment.mako:283 #: rhodecode/templates/codeblocks/diffs.mako:65 msgid "You need to be logged in to leave comments." msgstr "Vous devez vous connecter pour laisser un commentaire." -#: rhodecode/templates/changeset/changeset_file_comment.mako:283 +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 #: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Se connecter maintenant" -#: rhodecode/templates/changeset/changeset_file_comment.mako:348 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "" "Use @username inside this text to send notification to this RhodeCode user" msgstr "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à l’utilisateur RhodeCode en question." -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 +#: rhodecode/templates/changeset/changeset_file_comment.mako:352 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:368 +#: rhodecode/templates/changeset/changeset_file_comment.mako:369 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Fermée" -#: rhodecode/templates/changeset/changeset_file_comment.mako:398 +#: rhodecode/templates/changeset/changeset_file_comment.mako:399 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8975,71 +9015,71 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:290 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/codeblocks/diffs.mako:356 #: 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 +#: rhodecode/templates/codeblocks/diffs.mako:421 +#: rhodecode/templates/codeblocks/diffs.mako:437 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:417 -#: rhodecode/templates/codeblocks/diffs.mako:424 +#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:430 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:422 -#: rhodecode/templates/codeblocks/diffs.mako:438 +#: rhodecode/templates/codeblocks/diffs.mako:428 +#: rhodecode/templates/codeblocks/diffs.mako:444 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:433 -#: rhodecode/templates/codeblocks/diffs.mako:440 +#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:446 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:643 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:651 msgid "Side by Side" msgstr "Côte à côte" -#: rhodecode/templates/codeblocks/diffs.mako:649 +#: rhodecode/templates/codeblocks/diffs.mako:655 msgid "View unified" msgstr "Vue unifiée" -#: rhodecode/templates/codeblocks/diffs.mako:650 +#: rhodecode/templates/codeblocks/diffs.mako:656 msgid "Unified" msgstr "Unifié" -#: rhodecode/templates/codeblocks/diffs.mako:660 +#: rhodecode/templates/codeblocks/diffs.mako:666 msgid "Expand All Files" msgstr "Développer tous les fichiers" -#: rhodecode/templates/codeblocks/diffs.mako:664 +#: rhodecode/templates/codeblocks/diffs.mako:670 msgid "Collapse All Files" msgstr "Plier tous les fichiers" -#: rhodecode/templates/codeblocks/diffs.mako:668 +#: rhodecode/templates/codeblocks/diffs.mako:674 msgid "Wide Mode Diff" msgstr "Elargir le mode diff" @@ -9056,11 +9096,11 @@ msgid "Compare was calculated based on this shared commit." msgstr "La comparaison se base sur cette révision partagée" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 msgid "Time" msgstr "Temps" -#: rhodecode/templates/compare/compare_commits.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:78 msgid "No commits in this compare" msgstr "Pas de révisions dans cette comparaison" @@ -9631,7 +9671,7 @@ msgid "Close File List" msgstr "" #: rhodecode/templates/files/files_browser.mako:25 -#: rhodecode/templates/summary/summary_commits.mako:103 +#: rhodecode/templates/summary/summary_commits.mako:109 msgid "Add New File" msgstr "" @@ -9907,12 +9947,12 @@ msgid "Pull request reviewers" msgstr "Relecteurs de la requête de pull" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 msgid "Add reviewer or reviewer group" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:504 +#: rhodecode/templates/pullrequests/pullrequest.mako:508 msgid "Please select source and target" msgstr "" @@ -9920,19 +9960,19 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:364 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:368 +#: rhodecode/templates/pullrequests/pullrequest.mako:371 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:431 +#: rhodecode/templates/pullrequests/pullrequest.mako:435 msgid "Target repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:441 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Select commit reference" msgstr "" @@ -9993,8 +10033,7 @@ msgid "Merge" msgstr "Fusionner" #: rhodecode/templates/pullrequests/pullrequest_show.mako:140 -#: rhodecode/templates/summary/components.mako:53 -#: rhodecode/templates/summary/components.mako:69 +#: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" @@ -10074,85 +10113,81 @@ msgid "Pull request versions not available" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 -msgid "Mandatory reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 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:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 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:431 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 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:442 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 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:482 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:593 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:596 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 msgid "show them" msgstr "" @@ -10263,74 +10298,59 @@ msgstr "" msgid "File" msgstr "Fichier" -#: rhodecode/templates/summary/components.mako:49 -msgid "Read-only url" -msgstr "URL en lecture seule" - -#: rhodecode/templates/summary/components.mako:56 -#: rhodecode/templates/summary/components.mako:72 +#: rhodecode/templates/summary/components.mako:71 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:76 +msgid "Copy the clone by ssh url" +msgstr "" -#: 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 +#: rhodecode/templates/summary/components.mako:80 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:65 -msgid "Clone url" -msgstr "URL de clone" - -#: rhodecode/templates/summary/components.mako:94 +#: rhodecode/templates/summary/components.mako:100 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:110 +#: rhodecode/templates/summary/components.mako:116 msgid "Number of Repository Forks" msgstr "" -#: rhodecode/templates/summary/components.mako:118 +#: rhodecode/templates/summary/components.mako:124 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:149 +#: rhodecode/templates/summary/components.mako:155 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:153 +#: rhodecode/templates/summary/components.mako:159 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:156 +#: rhodecode/templates/summary/components.mako:162 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:167 +#: rhodecode/templates/summary/components.mako:173 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:173 +#: rhodecode/templates/summary/components.mako:179 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés." -#: rhodecode/templates/summary/components.mako:177 +#: rhodecode/templates/summary/components.mako:183 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:180 +#: rhodecode/templates/summary/components.mako:186 msgid "enable downloads" msgstr "Activer les téléchargements" @@ -10363,15 +10383,15 @@ msgstr "" msgid "%s RSS feed" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:100 +#: rhodecode/templates/summary/summary_commits.mako:106 msgid "Add or upload files directly via RhodeCode:" msgstr "Ajouter ou uploader des fichiers via RhodeCode:" -#: rhodecode/templates/summary/summary_commits.mako:111 +#: rhodecode/templates/summary/summary_commits.mako:117 msgid "Push new repo:" msgstr "Pousser le nouveau dépôt:" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:128 msgid "Existing repository?" msgstr "Le dépôt existe déjà ?" @@ -10399,9 +10419,3 @@ msgstr "Nom" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" msgstr "bonjour" - -#: rhodecode/tests/lib/test_ext_json.py:163 -msgid "singular" -msgid_plural "plural" -msgstr[0] "" -msgstr[1] "" diff --git a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.mo index 9fb0f187..40d662d3 100644 Binary files a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.mo and b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.mo differ diff --git a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po index 2952e9c8..44df9bb1 100644 --- a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po @@ -1,5 +1,5 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2017 RhodeCode GmbH +# Copyright (C) 2018 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-11-03 16:42+0100\n" -"PO-Revision-Date: 2017-11-03 15:43+0000\n" +"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"PO-Revision-Date: 2018-01-30 16:33+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Italian (http://www.transifex.com/rhodecode/RhodeCode/language/it/)\n" "MIME-Version: 1.0\n" @@ -20,32 +20,53 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/apps/_base/__init__.py:142 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "Errore durante la creazione del repository %s: certificato invalido" + +#: rhodecode/apps/_base/__init__.py:146 +#, python-format +msgid "Error creating repository %s" +msgstr "Errore durante la creazione del repository %s" + +#: rhodecode/apps/_base/__init__.py:219 +#, python-format +msgid "" +"The repository `%(repo_name)s` cannot be loaded in filesystem. Please check " +"if it exist, or is not damaged." +msgstr "" + +#: rhodecode/apps/_base/__init__.py:274 +msgid "Editing user `{}` is disabled." +msgstr "" + +#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "Globale" -#: rhodecode/apps/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:74 #: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "VCS" -#: rhodecode/apps/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:76 msgid "Visual" msgstr "Interfaccia" -#: rhodecode/apps/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:78 msgid "Remap and Rescan" msgstr "" -#: rhodecode/apps/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:80 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "" -#: rhodecode/apps/admin/navigation.py:89 -#: rhodecode/integrations/types/email.py:232 +#: rhodecode/apps/admin/navigation.py:82 +#: rhodecode/integrations/types/email.py:233 #: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 @@ -57,15 +78,15 @@ msgstr "" msgid "Email" msgstr "Email" -#: rhodecode/apps/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:84 msgid "Hooks" msgstr "Hooks" -#: rhodecode/apps/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:86 msgid "Full Text Search" msgstr "" -#: rhodecode/apps/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:88 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -79,28 +100,28 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 #: rhodecode/templates/admin/repos/repo_edit.mako:75 -#: rhodecode/templates/base/base.mako:82 +#: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "" -#: rhodecode/apps/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:90 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "Informazioni sistema" -#: rhodecode/apps/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:92 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:94 msgid "User Sessions" msgstr "" -#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/apps/admin/navigation.py:96 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:109 +#: rhodecode/apps/admin/navigation.py:101 msgid "Labs" msgstr "Laboratori" @@ -112,13 +133,13 @@ msgstr "Impostazioni di default aggiornate" 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 +#: rhodecode/apps/admin/views/permissions.py:120 msgid "Application permissions updated successfully" msgstr "Permessi applicati con successo." -#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:141 #: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:287 +#: rhodecode/apps/admin/views/permissions.py:288 msgid "Error occurred during update of permissions" msgstr "Errore durante l'aggiornamento dei permessi" @@ -126,11 +147,11 @@ msgstr "Errore durante l'aggiornamento dei permessi" msgid "Object permissions updated successfully" msgstr "Permessi sull'oggetto aggiornati." -#: rhodecode/apps/admin/views/permissions.py:267 +#: rhodecode/apps/admin/views/permissions.py:268 msgid "Global permissions updated successfully" msgstr "Permessi globali aggiornati correttamente" -#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/apps/admin/views/permissions.py:450 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:208 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -151,20 +172,20 @@ msgstr "Permessi globali aggiornati correttamente" msgid "Edit" msgstr "Modifica" -#: rhodecode/apps/admin/views/permissions.py:476 +#: rhodecode/apps/admin/views/permissions.py:478 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:479 +#: rhodecode/apps/admin/views/permissions.py:481 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:180 +#: rhodecode/apps/admin/views/repo_groups.py:181 #, python-format msgid "Created repository group %s" msgstr "Creato gruppo di repository %s" -#: rhodecode/apps/admin/views/repo_groups.py:198 +#: rhodecode/apps/admin/views/repo_groups.py:199 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Errore durante la creazione del gruppo di repository %s" @@ -173,10 +194,86 @@ msgstr "Errore durante la creazione del gruppo di repository %s" msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/apps/admin/views/sessions.py:98 +#: rhodecode/apps/admin/views/sessions.py:97 msgid "Failed to cleanup up old sessions" msgstr "" +#: rhodecode/apps/admin/views/settings.py:162 +#: rhodecode/apps/admin/views/settings.py:708 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +msgid "Some form inputs contain invalid data." +msgstr "Ci son dati non validi tra i dati immessi" + +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:351 +msgid "Error occurred during updating application settings" +msgstr "Errore durante l'aggiornamento delle impostazioni" + +#: rhodecode/apps/admin/views/settings.py:194 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +msgid "Updated VCS settings" +msgstr "Impostazioni VCS aggiornate" + +#: rhodecode/apps/admin/views/settings.py:268 +#, python-format +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "Scansione dei repository completata. Aggiunti: %s ; rimossi: %s" + +#: rhodecode/apps/admin/views/settings.py:347 +msgid "Updated application settings" +msgstr "Impostazioni applicazione aggiornate" + +#: rhodecode/apps/admin/views/settings.py:426 +msgid "Updated visualisation settings" +msgstr "Impostazioni di visualizzazione aggiornate" + +#: rhodecode/apps/admin/views/settings.py:429 +msgid "Error occurred during updating visualisation settings" +msgstr "Errore durante l'aggiornamento delle impostazioni di visualizzazione" + +#: rhodecode/apps/admin/views/settings.py:491 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +msgid "Invalid issue tracker pattern: {}" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:508 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +msgid "Updated issue tracker entries" +msgstr "Dati dell'Issue Tracker aggiornati" + +#: rhodecode/apps/admin/views/settings.py:526 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 +msgid "Removed issue tracker entry" +msgstr "Entry dell'issue tracker rimossa" + +#: rhodecode/apps/admin/views/settings.py:563 +msgid "Please enter email address" +msgstr "Prego fornire un indirizzo email" + +#: rhodecode/apps/admin/views/settings.py:581 +msgid "Send email task created" +msgstr "Task 'invio posta' creato" + +#: rhodecode/apps/admin/views/settings.py:631 +msgid "Added new hook" +msgstr "Aggiunto nuovo 'hook'" + +#: rhodecode/apps/admin/views/settings.py:646 +msgid "Updated hooks" +msgstr "'Hook' aggiornato" + +#: rhodecode/apps/admin/views/settings.py:650 +msgid "Error occurred during hook creation" +msgstr "Errore durante creazione hook'" + +#: rhodecode/apps/admin/views/settings.py:732 +msgid "Error occurred during updating labs settings" +msgstr "Errore durante l'aggiornamento delle impostazioni sui lab" + +#: rhodecode/apps/admin/views/settings.py:737 +msgid "Updated Labs settings" +msgstr "Impostazioni sui Lab aggiornate" + #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" @@ -185,149 +282,153 @@ msgstr "" msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/apps/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:79 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:102 +#: rhodecode/apps/admin/views/system_info.py:90 msgid "Update info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:104 +#: rhodecode/apps/admin/views/system_info.py:92 msgid "Check for updates" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:97 msgid "RhodeCode Version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:110 +#: rhodecode/apps/admin/views/system_info.py:98 +msgid "Latest version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:99 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:111 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:112 +#: rhodecode/apps/admin/views/system_info.py:101 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "RhodeCode Certificate" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:103 msgid "Workers" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:115 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Worker Type" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "Database" msgstr "Database" -#: rhodecode/apps/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:109 msgid "Database version" msgstr "Versione Database" -#: rhodecode/apps/admin/views/system_info.py:124 +#: rhodecode/apps/admin/views/system_info.py:113 msgid "Platform" msgstr "Piattaforma" -#: rhodecode/apps/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Platform UUID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Python version" msgstr "Versione python" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:116 msgid "Python path" msgstr "Percorso Python" -#: rhodecode/apps/admin/views/system_info.py:131 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "CPU" msgstr "CPU" -#: rhodecode/apps/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Load" msgstr "Carico" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Memory" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:123 msgid "Uptime" msgstr "Attivo da" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Storage location" msgstr "Percorso di storage" -#: rhodecode/apps/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Storage inodes" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "Gist storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Gist storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Archive cache storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:148 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Temp storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:149 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Temp storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Search info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Search location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:156 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "VCS Backends" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:157 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "VCS Server" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:158 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "GIT" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:159 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "HG" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:160 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "SVN" msgstr "" @@ -341,188 +442,188 @@ msgstr "Creato il gruppo utenti %(user_group_link)s" 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 +#: rhodecode/apps/admin/views/users.py:209 #, python-format msgid "Created user %(user_link)s" msgstr "Creato l'utente %(user_link)s" -#: rhodecode/apps/admin/views/users.py:229 +#: rhodecode/apps/admin/views/users.py:230 #, 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 +#: rhodecode/apps/admin/views/users.py:304 msgid "User updated successfully" msgstr "Utente aggiornato correttamente" -#: rhodecode/apps/admin/views/users.py:321 -#: rhodecode/apps/my_account/views/my_account.py:485 +#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/my_account/views/my_account.py:490 #, 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 +#: rhodecode/apps/admin/views/users.py:354 #, python-format msgid "Detached %s repositories" msgstr "Distaccati %s repository" -#: rhodecode/apps/admin/views/users.py:358 +#: rhodecode/apps/admin/views/users.py:359 #, python-format msgid "Deleted %s repositories" msgstr "%s repository cancellati" -#: rhodecode/apps/admin/views/users.py:366 +#: rhodecode/apps/admin/views/users.py:367 #, python-format msgid "Detached %s repository groups" msgstr "Distaccati %s gruppi di repository" -#: rhodecode/apps/admin/views/users.py:371 +#: rhodecode/apps/admin/views/users.py:372 #, python-format msgid "Deleted %s repository groups" msgstr "%s gruppo di repository cancellati" -#: rhodecode/apps/admin/views/users.py:379 +#: rhodecode/apps/admin/views/users.py:380 #, python-format msgid "Detached %s user groups" msgstr "Distaccati %s gruppi utente" -#: rhodecode/apps/admin/views/users.py:384 +#: rhodecode/apps/admin/views/users.py:385 #, python-format msgid "Deleted %s user groups" msgstr "%s gruppi utente cancellati" -#: rhodecode/apps/admin/views/users.py:401 +#: rhodecode/apps/admin/views/users.py:402 msgid "Successfully deleted user" msgstr "Utente eliminato" -#: rhodecode/apps/admin/views/users.py:407 +#: rhodecode/apps/admin/views/users.py:408 msgid "An error occurred during deletion of user" msgstr "Errore durante la cancellazione dell'utente" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:473 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 +#: rhodecode/apps/admin/views/users.py:479 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 +#: rhodecode/apps/admin/views/users.py:567 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 +#: rhodecode/apps/admin/views/users.py:585 +#: rhodecode/apps/user_group/views/__init__.py:448 msgid "An error occurred during permissions saving" msgstr "Errore avvenuto durante il salvataggio dei permessi" -#: rhodecode/apps/admin/views/users.py:608 +#: rhodecode/apps/admin/views/users.py:610 msgid "Force password change disabled for user" msgstr "Obbligo del cambiamento password disabilitato per l'utente" -#: rhodecode/apps/admin/views/users.py:613 +#: rhodecode/apps/admin/views/users.py:615 msgid "Force password change enabled for user" msgstr "Obbligo del cambio password abilitato per l'utente" -#: rhodecode/apps/admin/views/users.py:622 +#: rhodecode/apps/admin/views/users.py:624 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 +#: rhodecode/apps/admin/views/users.py:663 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:667 +#: rhodecode/apps/admin/views/users.py:669 #, python-format msgid "Created repository group `%s`" msgstr "Creato il gruppo di repository `%s`" -#: rhodecode/apps/admin/views/users.py:671 +#: rhodecode/apps/admin/views/users.py:673 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:676 +#: rhodecode/apps/admin/views/users.py:678 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/apps/admin/views/users.py:701 +#: rhodecode/apps/my_account/views/my_account.py:160 #: 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:737 -#: rhodecode/apps/my_account/views/my_account.py:193 +#: rhodecode/apps/admin/views/users.py:739 +#: rhodecode/apps/my_account/views/my_account.py:194 msgid "Auth token successfully created" msgstr "Token Autorizzativo creato" -#: rhodecode/apps/admin/views/users.py:766 -#: rhodecode/apps/my_account/views/my_account.py:217 +#: rhodecode/apps/admin/views/users.py:768 +#: rhodecode/apps/my_account/views/my_account.py:218 msgid "Auth token successfully deleted" msgstr "Token autorizzativo cancellato" -#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/admin/views/users.py:840 #: 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/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:849 #: 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/admin/views/users.py:883 #: 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 +#: rhodecode/apps/admin/views/users.py:929 +#: rhodecode/apps/my_account/views/my_account.py:260 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:928 +#: rhodecode/apps/admin/views/users.py:935 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 +#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/my_account/views/my_account.py:266 msgid "An error occurred during email saving" msgstr "Errore durante il salvataggio dell'email" -#: rhodecode/apps/admin/views/users.py:959 +#: rhodecode/apps/admin/views/users.py:966 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1005 +#: rhodecode/apps/admin/views/users.py:1012 #, python-format msgid "An error occurred during ip saving:%s" msgstr "Errore durante il salvataggio dell'ip: %s" -#: rhodecode/apps/admin/views/users.py:1023 +#: rhodecode/apps/admin/views/users.py:1034 msgid "An error occurred during ip saving" msgstr "Errore durante il salvataggio dell'ip" -#: rhodecode/apps/admin/views/users.py:1027 +#: rhodecode/apps/admin/views/users.py:1038 #, python-format msgid "Added ips %s to user whitelist" msgstr "Aggiunti gli ip %s alla 'whitelist' dell'utente" -#: rhodecode/apps/admin/views/users.py:1057 +#: rhodecode/apps/admin/views/users.py:1068 msgid "Removed ip address from user whitelist" msgstr "Indirizzo ip rimosso dalla 'whitelist' dell'utente" -#: rhodecode/apps/admin/views/users.py:1122 +#: rhodecode/apps/admin/views/users.py:1133 msgid "Groups successfully changed" msgstr "" @@ -547,10 +648,10 @@ 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 +#: rhodecode/public/js/rhodecode-components.js:49320 +#: rhodecode/public/js/scripts.js:41124 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/src/rhodecode.js:538 msgid "Lifetime" msgstr "a vita" @@ -601,75 +702,75 @@ msgstr "" 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/apps/home/views.py:218 rhodecode/apps/home/views.py:251 +#: rhodecode/apps/repository/views/repo_pull_requests.py:719 +#: rhodecode/templates/admin/my_account/my_account.mako:41 #: 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:580 +#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:150 +#: rhodecode/templates/base/base.mako:582 msgid "Repositories" msgstr "Repositories" -#: rhodecode/apps/home/views.py:241 +#: rhodecode/apps/home/views.py:244 msgid "Groups" msgstr "Gruppi" -#: rhodecode/apps/home/views.py:261 +#: rhodecode/apps/home/views.py:264 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "journal pubblico" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 msgid "journal" msgstr "journal" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:281 +#: rhodecode/apps/login/views.py:288 msgid "You have successfully registered with RhodeCode" msgstr "La registrazione con RhodeCode ha avuto successo" -#: rhodecode/apps/login/views.py:317 +#: rhodecode/apps/login/views.py:325 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:323 +#: rhodecode/apps/login/views.py:331 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:412 +#: rhodecode/apps/login/views.py:420 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:428 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/my_account.py:134 +#: rhodecode/apps/my_account/views/my_account.py:135 msgid "Error occurred during update of user password" msgstr "Errore durante l'aggiornamento della password" -#: rhodecode/apps/my_account/views/my_account.py:141 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "Password aggiornata correttamente" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:288 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:465 +#: rhodecode/apps/my_account/views/my_account.py:470 msgid "Your account was updated successfully" msgstr "Account aggiornato correttamente" @@ -684,7 +785,7 @@ 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 +#: rhodecode/apps/user_group/views/__init__.py:328 msgid "Cannot change permission for yourself as admin" msgstr "Impossibile cambiare i permessi per se stessi come admin" @@ -711,28 +812,28 @@ msgstr "Errore durante l'invalidazione della cache" #: 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:585 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_commits.py:192 #: 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 +#: rhodecode/apps/repository/views/repo_checks.py:98 #, python-format msgid "Created repository %s from %s" msgstr "Repository %s creato da %s" -#: rhodecode/apps/repository/views/repo_checks.py:104 +#: rhodecode/apps/repository/views/repo_checks.py:107 #, python-format msgid "Forked repository %s as %s" msgstr "Fork del repository %s come %s" -#: rhodecode/apps/repository/views/repo_checks.py:107 +#: rhodecode/apps/repository/views/repo_checks.py:110 #, python-format msgid "Created repository %s" msgstr "Repository %s creato" @@ -761,13 +862,13 @@ msgstr "Allarga il contesto" 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 +#: rhodecode/apps/repository/views/repo_commits.py:388 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1129 #, 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 +#: rhodecode/apps/repository/views/repo_commits.py:432 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -849,14 +950,14 @@ 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/apps/repository/views/repo_summary.py:322 +#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 #: 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 +#: rhodecode/model/scm.py:804 rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "Tags" @@ -917,12 +1018,12 @@ msgid "" "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 +#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "Confronta FORK" -#: rhodecode/apps/repository/views/repo_forks.py:250 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "Errore durante il fork del repository %s" @@ -931,91 +1032,88 @@ msgstr "Errore durante il fork del repository %s" msgid "Repository permissions updated" msgstr "Permessi sul repository aggiornati" -#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +#: rhodecode/apps/repository/views/repo_pull_requests.py:615 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:750 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +#: rhodecode/apps/repository/views/repo_pull_requests.py:775 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +#: rhodecode/apps/repository/views/repo_pull_requests.py:790 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +#: rhodecode/apps/repository/views/repo_pull_requests.py:841 msgid "Successfully opened new pull request" msgstr "'Pull request' aperta correttamente" -#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +#: rhodecode/apps/repository/views/repo_pull_requests.py:844 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +#: rhodecode/apps/repository/views/repo_pull_requests.py:875 +#: rhodecode/apps/repository/views/repo_pull_requests.py:905 msgid "Cannot update closed pull requests." msgstr "Non è possibile aggiornare richieste PULL già chiuse" -#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +#: rhodecode/apps/repository/views/repo_pull_requests.py:911 msgid "Pull request title & description updated." msgstr "Titolo e Descrizione della richiesta PULL aggiornati." -#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:946 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1010 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1034 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1060 msgid "Successfully deleted pull request" msgstr "'Pull request' eliminata con successo" -#: rhodecode/apps/repository/views/repo_settings.py:167 +#: rhodecode/apps/repository/views/repo_settings.py:168 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:193 +#: rhodecode/apps/repository/views/repo_settings.py:194 msgid "Unlocked" msgstr "Sbloccato" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:199 msgid "Locked" msgstr "Bloccato" -#: rhodecode/apps/repository/views/repo_settings.py:200 +#: rhodecode/apps/repository/views/repo_settings.py:201 #, 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.py:205 #: 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 +#: rhodecode/apps/repository/views/repo_settings.py:249 msgid "An error occurred during deletion of repository stats" msgstr "Errore durante l'eliminazione delle statistiche del repository" @@ -1078,28 +1176,18 @@ msgstr "Repository bloccato" msgid "Unlocked repository" msgstr "Repository sbloccato" -#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +#: rhodecode/apps/repository/views/repo_settings_fields.py:86 msgid "An error occurred during creation of field" msgstr "Errore durante la crezione del campo" -#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +#: rhodecode/apps/repository/views/repo_settings_fields.py:108 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 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86 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" @@ -1108,34 +1196,23 @@ msgstr "Effettuato 'Pull' dal remoto" 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 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Branch" msgstr "Branch" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Tag" msgstr "Tag" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:299 msgid "Bookmark" msgstr "Segnalibro" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:323 msgid "Closed branches" msgstr "Branch chiusi" @@ -1147,41 +1224,41 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:209 +#: rhodecode/apps/user_group/views/__init__.py:184 #, python-format msgid "Updated user group %s" msgstr "Gruppo utenti %s aggiornato" -#: rhodecode/apps/user_group/views/__init__.py:231 +#: rhodecode/apps/user_group/views/__init__.py:206 #, 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 +#: rhodecode/apps/user_group/views/__init__.py:232 msgid "Successfully deleted user group" msgstr "Gruppo utenti eliminato" -#: rhodecode/apps/user_group/views/__init__.py:262 +#: rhodecode/apps/user_group/views/__init__.py:237 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 +#: rhodecode/apps/user_group/views/__init__.py:341 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 +#: rhodecode/apps/user_group/views/__init__.py:356 msgid "User Group permissions updated" msgstr "Permessi del gruppo utenti aggiornati" -#: rhodecode/apps/user_group/views/__init__.py:452 +#: rhodecode/apps/user_group/views/__init__.py:428 msgid "User Group global permissions updated successfully" msgstr "Permessi globali dei Gruppi Utenti aggiornati." -#: rhodecode/apps/user_group/views/__init__.py:534 +#: rhodecode/apps/user_group/views/__init__.py:510 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:538 +#: rhodecode/apps/user_group/views/__init__.py:514 msgid "An error occurred during synchronization update" msgstr "" @@ -1208,20 +1285,20 @@ msgstr "" msgid "Auth Cache TTL" msgstr "" -#: rhodecode/authentication/views.py:90 +#: rhodecode/authentication/views.py:93 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:170 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:181 +#: rhodecode/authentication/views.py:173 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:191 +#: rhodecode/authentication/views.py:181 msgid "Error occurred during update of auth settings." msgstr "" @@ -1346,11 +1423,11 @@ msgid "Password to authenticate for given user DN." msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 -#: rhodecode/integrations/types/webhook.py:214 +#: rhodecode/integrations/types/webhook.py:220 #: 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:324 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Password" @@ -1474,56 +1551,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:286 -msgid "Error occurred during updating application settings" -msgstr "Errore durante l'aggiornamento delle impostazioni" - -#: rhodecode/controllers/admin/settings.py:226 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "Scansione dei repository completata. Aggiunti: %s ; rimossi: %s" - -#: rhodecode/controllers/admin/settings.py:282 -msgid "Updated application settings" -msgstr "Impostazioni applicazione aggiornate" - -#: rhodecode/controllers/admin/settings.py:348 -msgid "Updated visualisation settings" -msgstr "Impostazioni di visualizzazione aggiornate" - -#: rhodecode/controllers/admin/settings.py:351 -msgid "Error occurred during updating visualisation settings" -msgstr "Errore durante l'aggiornamento delle impostazioni di visualizzazione" - -#: rhodecode/controllers/admin/settings.py:444 -msgid "Please enter email address" -msgstr "Prego fornire un indirizzo email" - -#: rhodecode/controllers/admin/settings.py:462 -msgid "Send email task created" -msgstr "Task 'invio posta' creato" - -#: rhodecode/controllers/admin/settings.py:495 -msgid "Added new hook" -msgstr "Aggiunto nuovo 'hook'" - -#: rhodecode/controllers/admin/settings.py:510 -msgid "Updated hooks" -msgstr "'Hook' aggiornato" - -#: rhodecode/controllers/admin/settings.py:514 -msgid "Error occurred during hook creation" -msgstr "Errore durante creazione hook'" - -#: rhodecode/controllers/admin/settings.py:643 -msgid "Error occurred during updating labs settings" -msgstr "Errore durante l'aggiornamento delle impostazioni sui lab" - -#: rhodecode/controllers/admin/settings.py:648 -msgid "Updated Labs settings" -msgstr "Impostazioni sui Lab aggiornate" - #: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" @@ -1548,35 +1575,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:149 +#: rhodecode/events/repo.py:189 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:158 +#: rhodecode/events/repo.py:198 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:167 +#: rhodecode/events/repo.py:207 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:176 +#: rhodecode/events/repo.py:216 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:256 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:265 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:274 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:285 msgid "repository push" msgstr "" @@ -1627,7 +1654,7 @@ msgstr "" #: 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:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:215 #: 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 @@ -1655,9 +1682,9 @@ msgstr "Ripristina" #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: 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/changeset/changeset_file_comment.mako:143 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:148 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1720,81 +1747,81 @@ msgstr "" msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:302 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:327 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:214 +#: rhodecode/integrations/types/email.py:215 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:215 +#: rhodecode/integrations/types/email.py:216 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:220 #: rhodecode/integrations/types/email.py:221 +#: rhodecode/integrations/types/email.py:222 msgid "Email address" msgstr "" -#: rhodecode/integrations/types/email.py:233 +#: rhodecode/integrations/types/email.py:234 msgid "Send repo push summaries to a list of recipients via email" msgstr "" -#: rhodecode/integrations/types/hipchat.py:43 +#: rhodecode/integrations/types/hipchat.py:41 msgid "Yellow" msgstr "" -#: rhodecode/integrations/types/hipchat.py:44 +#: rhodecode/integrations/types/hipchat.py:42 msgid "Red" msgstr "" -#: rhodecode/integrations/types/hipchat.py:45 +#: rhodecode/integrations/types/hipchat.py:43 msgid "Green" msgstr "" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Purple" msgstr "" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Gray" msgstr "" -#: rhodecode/integrations/types/hipchat.py:52 +#: rhodecode/integrations/types/hipchat.py:50 msgid "Hipchat server URL" msgstr "" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:51 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:63 +#: rhodecode/integrations/types/hipchat.py:61 msgid "Notify" msgstr "" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:62 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:70 +#: rhodecode/integrations/types/hipchat.py:68 msgid "Color" msgstr "" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:69 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:99 +#: rhodecode/integrations/types/hipchat.py:97 msgid "Hipchat" msgstr "" -#: rhodecode/integrations/types/hipchat.py:100 +#: rhodecode/integrations/types/hipchat.py:98 msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" @@ -1810,7 +1837,7 @@ msgid "" msgstr "" #: rhodecode/integrations/types/slack.py:60 -#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/integrations/types/webhook.py:210 #: 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 @@ -1821,7 +1848,7 @@ msgstr "" #: 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:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1857,11 +1884,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:177 +#: rhodecode/integrations/types/webhook.py:183 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:185 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 " @@ -1869,53 +1896,53 @@ msgid "" "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:199 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:194 +#: rhodecode/integrations/types/webhook.py:200 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 +#: rhodecode/integrations/types/webhook.py:211 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:215 +#: rhodecode/integrations/types/webhook.py:221 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:225 +#: rhodecode/integrations/types/webhook.py:231 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:226 +#: rhodecode/integrations/types/webhook.py:232 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:235 +#: rhodecode/integrations/types/webhook.py:241 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:236 +#: rhodecode/integrations/types/webhook.py:242 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:245 +#: rhodecode/integrations/types/webhook.py:251 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:246 +#: rhodecode/integrations/types/webhook.py:252 msgid "Select if the Webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:259 +#: rhodecode/integrations/types/webhook.py:265 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:260 +#: rhodecode/integrations/types/webhook.py:266 msgid "Post json events to a Webhook endpoint" msgstr "" @@ -2003,80 +2030,63 @@ msgstr "[da ora segui] repository" msgid "[stopped following] repository" msgstr "[non segui più] repository" -#: rhodecode/lib/action_parser.py:171 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "Nome del 'fork' %s" -#: rhodecode/lib/action_parser.py:189 +#: rhodecode/lib/action_parser.py:191 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "Richiesta di 'Pull' #%s" -#: rhodecode/lib/action_parser.py:223 +#: rhodecode/lib/action_parser.py:226 #, python-format msgid "Show all combined commits %s->%s" msgstr "Mostra tutte le commit combinate %s->%s" -#: rhodecode/lib/action_parser.py:228 +#: rhodecode/lib/action_parser.py:231 msgid "compare view" msgstr "vista comparativa" -#: rhodecode/lib/action_parser.py:235 +#: rhodecode/lib/action_parser.py:238 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:288 +#: rhodecode/lib/action_parser.py:293 #, python-format msgid "Deleted branch: %s" msgstr "Eliminato il branch: %s" -#: rhodecode/lib/action_parser.py:291 +#: rhodecode/lib/action_parser.py:296 #, python-format msgid "Created tag: %s" msgstr "Creato il tag: %s" -#: rhodecode/lib/action_parser.py:304 +#: rhodecode/lib/action_parser.py:309 msgid "Commit not found" msgstr "Commit non trovata" -#: rhodecode/lib/auth.py:1445 +#: rhodecode/lib/auth.py:1441 #, python-format msgid "IP %s not allowed" msgstr "IP %s non consentito" -#: rhodecode/lib/auth.py:1535 +#: rhodecode/lib/auth.py:1531 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:1577 +#: rhodecode/lib/auth.py:1575 msgid "You need to be signed in to view this page" msgstr "Bisogna autenticarsi per vedere questa pagina" -#: rhodecode/lib/diffs.py:62 -msgid "Click to comment" -msgstr "" - -#: rhodecode/lib/diffs.py:77 -msgid "Binary file" -msgstr "File binario" - -#: rhodecode/lib/diffs.py:98 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Il changeset è troppo lungo ed è stato troncato. Usa il menù 'diff' per visualizzare tutte le differenze" - -#: rhodecode/lib/diffs.py:109 -msgid "No changes detected" -msgstr "Nessun cambiamento rilevato" - -#: rhodecode/lib/diffs.py:927 +#: rhodecode/lib/diffs.py:864 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1869 +#: rhodecode/lib/helpers.py:1855 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2096,7 +2106,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1893 +#: rhodecode/lib/helpers.py:1879 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2110,49 +2120,49 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1910 +#: rhodecode/lib/helpers.py:1896 #, 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:525 +#: rhodecode/lib/utils2.py:524 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:531 +#: rhodecode/lib/utils2.py:530 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:540 +#: rhodecode/lib/utils2.py:539 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:542 +#: rhodecode/lib/utils2.py:541 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:544 +#: rhodecode/lib/utils2.py:543 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:546 +#: rhodecode/lib/utils2.py:545 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:548 +#: rhodecode/lib/utils2.py:547 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:550 +#: rhodecode/lib/utils2.py:549 msgid "in ${val} and ${detail}" msgstr "" -#: 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/lib/utils2.py:553 +#: rhodecode/public/js/rhodecode-components.js:30702 +#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "proprio ora" @@ -2180,6 +2190,7 @@ msgstr "proprio ora" #: 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_11_0_0.py:2599 #: 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 @@ -2188,7 +2199,7 @@ msgstr "proprio ora" #: 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 +#: rhodecode/model/db.py:2626 msgid "Repository no access" msgstr "Repository nessun accesso" @@ -2215,6 +2226,7 @@ msgstr "Repository nessun accesso" #: 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_11_0_0.py:2600 #: 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 @@ -2223,7 +2235,7 @@ msgstr "Repository nessun accesso" #: 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 +#: rhodecode/model/db.py:2627 msgid "Repository read access" msgstr "Repository accesso in lettura" @@ -2250,6 +2262,7 @@ msgstr "Repository accesso in lettura" #: 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_11_0_0.py:2601 #: 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 @@ -2258,7 +2271,7 @@ msgstr "Repository accesso in lettura" #: 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 +#: rhodecode/model/db.py:2628 msgid "Repository write access" msgstr "Repository accesso in scrittura" @@ -2285,6 +2298,7 @@ msgstr "Repository accesso in scrittura" #: 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_11_0_0.py:2602 #: 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 @@ -2293,7 +2307,7 @@ msgstr "Repository accesso in scrittura" #: 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 +#: rhodecode/model/db.py:2629 msgid "Repository admin access" msgstr "Repository accesso admin" @@ -2360,6 +2374,7 @@ msgstr "RhodeCode Administrator" #: 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_11_0_0.py:2620 #: 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 @@ -2368,7 +2383,7 @@ msgstr "RhodeCode Administrator" #: 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 +#: rhodecode/model/db.py:2647 msgid "Repository creation disabled" msgstr "Creazione di Repository disabilitata" @@ -2395,6 +2410,7 @@ msgstr "Creazione di Repository disabilitata" #: 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_11_0_0.py:2621 #: 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 @@ -2403,7 +2419,7 @@ msgstr "Creazione di Repository disabilitata" #: 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 +#: rhodecode/model/db.py:2648 msgid "Repository creation enabled" msgstr "Creazione di Repository abilitata" @@ -2430,6 +2446,7 @@ msgstr "Creazione di Repository abilitata" #: 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_11_0_0.py:2625 #: 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 @@ -2438,7 +2455,7 @@ msgstr "Creazione di Repository abilitata" #: 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 +#: rhodecode/model/db.py:2652 msgid "Repository forking disabled" msgstr "Forking Repository disabilitato" @@ -2465,6 +2482,7 @@ msgstr "Forking Repository disabilitato" #: 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_11_0_0.py:2626 #: 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 @@ -2473,7 +2491,7 @@ msgstr "Forking Repository disabilitato" #: 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 +#: rhodecode/model/db.py:2653 msgid "Repository forking enabled" msgstr "Forking Repository abilitato" @@ -2521,6 +2539,7 @@ msgstr "Registrazione nuovo utente attraverso RhodeCode e attivazione automatica #: 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_11_0_0.py:3328 #: 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 @@ -2529,7 +2548,11 @@ msgstr "Registrazione nuovo utente attraverso RhodeCode e attivazione automatica #: 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 +#: rhodecode/model/db.py:3355 +#: rhodecode/public/js/rhodecode-components.js:48211 +#: rhodecode/public/js/scripts.js:40015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "Not Reviewed" msgstr "Non Revisionato" @@ -2556,6 +2579,7 @@ msgstr "Non Revisionato" #: 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_11_0_0.py:3329 #: 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 @@ -2564,7 +2588,7 @@ msgstr "Non Revisionato" #: 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 +#: rhodecode/model/db.py:3356 msgid "Approved" msgstr "Approvato" @@ -2591,6 +2615,7 @@ msgstr "Approvato" #: 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_11_0_0.py:3330 #: 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 @@ -2599,7 +2624,7 @@ msgstr "Approvato" #: 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 +#: rhodecode/model/db.py:3357 msgid "Rejected" msgstr "Rifiutato" @@ -2626,6 +2651,7 @@ msgstr "Rifiutato" #: 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_11_0_0.py:3331 #: 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 @@ -2634,7 +2660,7 @@ msgstr "Rifiutato" #: 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 +#: rhodecode/model/db.py:3358 msgid "Under Review" msgstr "in Revisione" @@ -2658,6 +2684,7 @@ msgstr "in Revisione" #: 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_11_0_0.py:2604 #: 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 @@ -2666,7 +2693,7 @@ msgstr "in Revisione" #: 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 +#: rhodecode/model/db.py:2631 msgid "Repository group no access" msgstr "Gruppo di repository: nessun accesso" @@ -2690,6 +2717,7 @@ msgstr "Gruppo di repository: nessun accesso" #: 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_11_0_0.py:2605 #: 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 @@ -2698,7 +2726,7 @@ msgstr "Gruppo di repository: nessun accesso" #: 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 +#: rhodecode/model/db.py:2632 msgid "Repository group read access" msgstr "Gruppo di repository: accesso in lettura" @@ -2722,6 +2750,7 @@ msgstr "Gruppo di repository: accesso in lettura" #: 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_11_0_0.py:2606 #: 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 @@ -2730,7 +2759,7 @@ msgstr "Gruppo di repository: accesso in lettura" #: 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 +#: rhodecode/model/db.py:2633 msgid "Repository group write access" msgstr "Gruppo di repository: accesso in scrittura" @@ -2754,6 +2783,7 @@ msgstr "Gruppo di repository: accesso in scrittura" #: 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_11_0_0.py:2607 #: 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 @@ -2762,7 +2792,7 @@ msgstr "Gruppo di repository: accesso in scrittura" #: 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 +#: rhodecode/model/db.py:2634 msgid "Repository group admin access" msgstr "Gruppo di repository: accesso admin" @@ -2785,6 +2815,7 @@ msgstr "Gruppo di repository: accesso admin" #: 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_11_0_0.py:2609 #: 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 @@ -2793,7 +2824,7 @@ msgstr "Gruppo di repository: accesso admin" #: 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 +#: rhodecode/model/db.py:2636 msgid "User group no access" msgstr "Gruppo utenti: nessun accesso" @@ -2816,6 +2847,7 @@ msgstr "Gruppo utenti: nessun accesso" #: 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_11_0_0.py:2610 #: 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 @@ -2824,7 +2856,7 @@ msgstr "Gruppo utenti: nessun accesso" #: 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 +#: rhodecode/model/db.py:2637 msgid "User group read access" msgstr "Gruppo utenti: accesso in lettura" @@ -2847,6 +2879,7 @@ msgstr "Gruppo utenti: accesso in lettura" #: 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_11_0_0.py:2611 #: 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 @@ -2855,7 +2888,7 @@ msgstr "Gruppo utenti: accesso in lettura" #: 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 +#: rhodecode/model/db.py:2638 msgid "User group write access" msgstr "Gruppo utenti: accesso in scrittura" @@ -2878,6 +2911,7 @@ msgstr "Gruppo utenti: accesso in scrittura" #: 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_11_0_0.py:2612 #: 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 @@ -2886,7 +2920,7 @@ msgstr "Gruppo utenti: accesso in scrittura" #: 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 +#: rhodecode/model/db.py:2639 msgid "User group admin access" msgstr "Gruppo utenti: accesso admin" @@ -2909,6 +2943,7 @@ msgstr "Gruppo utenti: accesso admin" #: 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_11_0_0.py:2614 #: 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 @@ -2917,7 +2952,7 @@ msgstr "Gruppo utenti: accesso admin" #: 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 +#: rhodecode/model/db.py:2641 msgid "Repository Group creation disabled" msgstr "Creazione gruppo di repository disabiltiata" @@ -2940,6 +2975,7 @@ msgstr "Creazione gruppo di repository disabiltiata" #: 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_11_0_0.py:2615 #: 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 @@ -2948,7 +2984,7 @@ msgstr "Creazione gruppo di repository disabiltiata" #: 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 +#: rhodecode/model/db.py:2642 msgid "Repository Group creation enabled" msgstr "Creazione gruppo di repository abilitata" @@ -2971,6 +3007,7 @@ msgstr "Creazione gruppo di repository abilitata" #: 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_11_0_0.py:2617 #: 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 @@ -2979,7 +3016,7 @@ msgstr "Creazione gruppo di repository abilitata" #: 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 +#: rhodecode/model/db.py:2644 msgid "User Group creation disabled" msgstr "Creazione gruppo utenti disabilitata" @@ -3002,6 +3039,7 @@ msgstr "Creazione gruppo utenti disabilitata" #: 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_11_0_0.py:2618 #: 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 @@ -3010,7 +3048,7 @@ msgstr "Creazione gruppo utenti disabilitata" #: 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 +#: rhodecode/model/db.py:2645 msgid "User Group creation enabled" msgstr "Creazione gruppo utenti abilitata" @@ -3033,6 +3071,7 @@ msgstr "Creazione gruppo utenti abilitata" #: 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_11_0_0.py:2628 #: 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 @@ -3041,7 +3080,7 @@ msgstr "Creazione gruppo utenti abilitata" #: 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 +#: rhodecode/model/db.py:2655 msgid "Registration disabled" msgstr "Registrazione disabilitata" @@ -3064,6 +3103,7 @@ msgstr "Registrazione disabilitata" #: 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_11_0_0.py:2629 #: 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 @@ -3072,7 +3112,7 @@ msgstr "Registrazione disabilitata" #: 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 +#: rhodecode/model/db.py:2656 msgid "User Registration with manual account activation" msgstr "Registrazione utente con attivazione manuale dell'account" @@ -3095,6 +3135,7 @@ msgstr "Registrazione utente con attivazione manuale dell'account" #: 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_11_0_0.py:2630 #: 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 @@ -3103,7 +3144,7 @@ msgstr "Registrazione utente con attivazione manuale dell'account" #: 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 +#: rhodecode/model/db.py:2657 msgid "User Registration with automatic account activation" msgstr "Registrazione utente con attivazione automatica dell'account" @@ -3126,6 +3167,7 @@ msgstr "Registrazione utente con attivazione automatica dell'account" #: 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_11_0_0.py:2636 #: 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 @@ -3134,7 +3176,7 @@ msgstr "Registrazione utente con attivazione automatica dell'account" #: 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 +#: rhodecode/model/db.py:2663 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "Attivazione manuale di account esterni" @@ -3157,6 +3199,7 @@ msgstr "Attivazione manuale di account esterni" #: 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_11_0_0.py:2637 #: 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 @@ -3165,7 +3208,7 @@ msgstr "Attivazione manuale di account esterni" #: 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 +#: rhodecode/model/db.py:2664 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "Attivazione automatrica di account esterni" @@ -3182,6 +3225,7 @@ msgstr "Attivazione automatrica di account esterni" #: 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_11_0_0.py:2622 #: 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 @@ -3190,7 +3234,7 @@ msgstr "Attivazione automatrica di account esterni" #: 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 +#: rhodecode/model/db.py:2649 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "Creazione di repository abilitata con permessi di scrittura al gruppo di repository" @@ -3208,6 +3252,7 @@ msgstr "Creazione di repository abilitata con permessi di scrittura al gruppo di #: 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_11_0_0.py:2623 #: 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 @@ -3216,7 +3261,7 @@ msgstr "Creazione di repository abilitata con permessi di scrittura al gruppo di #: 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 +#: rhodecode/model/db.py:2650 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" @@ -3231,6 +3276,7 @@ msgstr "Creazione di repository disabilitata abilitata con permessi di scrittura #: 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_11_0_0.py:2597 #: 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 @@ -3239,7 +3285,7 @@ msgstr "Creazione di repository disabilitata abilitata con permessi di scrittura #: 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 +#: rhodecode/model/db.py:2624 msgid "RhodeCode Super Administrator" msgstr "RhodeCode Super Administrator" @@ -3251,6 +3297,7 @@ msgstr "RhodeCode Super Administrator" #: 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_11_0_0.py:2639 #: 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 @@ -3259,7 +3306,7 @@ msgstr "RhodeCode Super Administrator" #: 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 +#: rhodecode/model/db.py:2666 msgid "Inherit object permissions from default user disabled" msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." @@ -3271,6 +3318,7 @@ msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." #: 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_11_0_0.py:2640 #: 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 @@ -3279,10 +3327,11 @@ msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto disabilitata." #: 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 +#: rhodecode/model/db.py:2667 msgid "Inherit object permissions from default user enabled" msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto abilitata" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 #: 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 @@ -3291,10 +3340,11 @@ msgstr "Ereditarietà dei permessi \"user default\" sull'oggetto abilitata" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: 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 +#: rhodecode/model/db.py:1107 msgid "all" msgstr "tutti" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3303,10 +3353,11 @@ msgstr "tutti" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: 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 +#: rhodecode/model/db.py:1108 msgid "http/web interface" msgstr "interfaccia http/web" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3315,10 +3366,11 @@ msgstr "interfaccia http/web" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: 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 +#: rhodecode/model/db.py:1109 msgid "vcs (git/hg/svn protocol)" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3327,10 +3379,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: 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 +#: rhodecode/model/db.py:1110 msgid "api calls" msgstr "chiamate API" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 #: 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 @@ -3339,10 +3392,11 @@ msgstr "chiamate API" #: 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 +#: rhodecode/model/db.py:1111 msgid "feed access" msgstr "accesso al feed" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 #: 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 @@ -3351,60 +3405,51 @@ msgstr "accesso al feed" #: 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 +#: rhodecode/model/db.py:2387 msgid "No parent" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 #: 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 +#: rhodecode/model/db.py:2659 msgid "Password reset enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 #: 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 +#: rhodecode/model/db.py:2660 msgid "Password reset hidden" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 #: 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 +#: rhodecode/model/db.py:2661 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:150 -msgid "Invalid search query. Try quoting it." -msgstr "Stringa di ricerca invalida. Provare a quotarla" - -#: rhodecode/lib/index/whoosh.py:152 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Non ci sono indici con cui effettuare la ricerca. Avviare 'whoosh indexer'" - -#: rhodecode/lib/index/whoosh.py:157 -msgid "An error occurred during this search operation" -msgstr "Errore durante la ricerca" - -#: rhodecode/lib/index/whoosh.py:165 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:166 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "Indice del File" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "Documenti indicizzati" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "Ultimo aggiornamento" -#: rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" @@ -3424,28 +3469,28 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:382 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:376 +#: rhodecode/model/comment.py:383 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:87 +#: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "Prego specificare una login" -#: rhodecode/model/forms.py:88 +#: rhodecode/model/forms.py:89 #, 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:98 +#: rhodecode/model/forms.py:99 msgid "Please enter a password" msgstr "Prego inserire una password" -#: rhodecode/model/forms.py:99 +#: rhodecode/model/forms.py:100 #, python-format msgid "Enter %(min)i characters or more" msgstr "Inserire almeno %(min)i caratteri" @@ -3532,8 +3577,8 @@ msgstr "Lettura" #: 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 -#: rhodecode/templates/changeset/changeset_file_comment.mako:321 +#: rhodecode/templates/changeset/changeset_file_comment.mako:272 +#: rhodecode/templates/changeset/changeset_file_comment.mako:322 msgid "Write" msgstr "Scrittura" @@ -3567,8 +3612,8 @@ 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:417 -#: rhodecode/templates/base/base.mako:424 +#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:426 msgid "Admin" msgstr "Admin" @@ -3685,115 +3730,79 @@ msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1218 msgid "Server-side pull request merging is disabled." msgstr "L'Incorporamento lato server delle richiesta di PULL è disabilitato" -#: rhodecode/model/pull_request.py:1168 +#: rhodecode/model/pull_request.py:1220 msgid "This pull request is closed." msgstr "Questa richiesta PULL è chiusa." -#: rhodecode/model/pull_request.py:1181 +#: rhodecode/model/pull_request.py:1233 msgid "Pull request merging is not supported." msgstr "L'incorporamento delle richieste PULL non è supportato." -#: rhodecode/model/pull_request.py:1200 +#: rhodecode/model/pull_request.py:1252 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:1203 +#: rhodecode/model/pull_request.py:1255 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:1365 rhodecode/model/scm.py:784 +#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 msgid "Bookmarks" msgstr "Segnalibri" -#: rhodecode/model/pull_request.py:1370 +#: rhodecode/model/pull_request.py:1425 msgid "Commit IDs" msgstr "Commit IDs" -#: rhodecode/model/pull_request.py:1373 +#: rhodecode/model/pull_request.py:1428 msgid "Closed Branches" msgstr "Branch chiusi" -#: rhodecode/model/pull_request.py:1533 +#: rhodecode/model/pull_request.py:1588 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1546 +#: rhodecode/model/pull_request.py:1601 msgid "Pull request reviewer approval is pending." msgstr "Approvazione della richiesta PULL in attesa." -#: rhodecode/model/pull_request.py:1561 +#: rhodecode/model/pull_request.py:1616 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1564 +#: rhodecode/model/pull_request.py:1619 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1599 +#: rhodecode/model/pull_request.py:1654 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1604 +#: rhodecode/model/pull_request.py:1659 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1611 +#: rhodecode/model/pull_request.py:1666 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1613 +#: rhodecode/model/pull_request.py:1668 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:762 +#: rhodecode/model/scm.py:775 msgid "latest tip" msgstr "ultimo consiglio" -#: rhodecode/model/user.py:166 -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: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: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: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: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:532 -#, python-format -msgid "" -"user \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups:%s" -msgstr "L'utente \"%s\" è ancora proprietario di %s gruppi utente e non può essere rimosso. Sostituire il proprietario o rimuovere quei gruppi utente: %s" - -#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99 +#: rhodecode/model/validators.py:92 rhodecode/model/validators.py:93 msgid "Value cannot be an empty list" msgstr "Il valore non può essere una lista vuota" -#: rhodecode/model/validators.py:142 +#: rhodecode/model/validators.py:139 msgid "Pattern already exists" msgstr "Pattern esistente" @@ -3814,30 +3823,26 @@ msgid "" "dashes and must begin with alphanumeric character or underscore" msgstr "Il nome utente può contenere solo caratteri alfanumerici, trattini (bassi e medi) e deve cominciare necessariamente con un carattere alfanumerico o un trattino (basso)" -#: rhodecode/model/validators.py:192 -msgid "The input is not valid" -msgstr "Il dato immesso non è valido" - -#: rhodecode/model/validators.py:199 +#: rhodecode/model/validators.py:195 #, python-format msgid "Username %(username)s is not valid" msgstr "Nome utente %(username)s non valido" -#: rhodecode/model/validators.py:200 +#: rhodecode/model/validators.py:196 #, python-format msgid "Username %(username)s is disabled" msgstr "" -#: rhodecode/model/validators.py:223 +#: rhodecode/model/validators.py:221 msgid "Invalid user group name" msgstr "Nome del gruppo non valido" -#: rhodecode/model/validators.py:224 +#: rhodecode/model/validators.py:222 #, python-format msgid "User group `%(usergroup)s` already exists" msgstr "" -#: rhodecode/model/validators.py:226 +#: rhodecode/model/validators.py:224 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -3865,166 +3870,166 @@ msgstr "Non hai i permessi per salvare qui questo gruppo di repository" msgid "no permission to store repository group in root location" msgstr "Non hai i permessi per salvare il gruppo di repository nella radice" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:387 msgid "Invalid characters (non-ascii) in password" msgstr "La password contiene dei caratteri (non ascii) non consentiti" -#: rhodecode/model/validators.py:401 -msgid "Invalid old password" -msgstr "Vecchia password sbagliata" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:406 msgid "Passwords do not match" msgstr "Le password non corrispondono" -#: rhodecode/model/validators.py:436 +#: rhodecode/model/validators.py:426 msgid "invalid password" msgstr "Password errata" -#: rhodecode/model/validators.py:437 +#: rhodecode/model/validators.py:427 msgid "invalid user name" msgstr "Nome utente errato" -#: rhodecode/model/validators.py:438 +#: rhodecode/model/validators.py:428 msgid "Your account is disabled" msgstr "Account disabilitato" -#: rhodecode/model/validators.py:470 -msgid "Token mismatch" -msgstr "Il token non corrisponde" - -#: rhodecode/model/validators.py:484 +#: rhodecode/model/validators.py:464 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Non è consentito chiamare un repository %(repo)s " -#: rhodecode/model/validators.py:486 +#: rhodecode/model/validators.py:466 #, python-format msgid "Repository with name %(repo)s already exists" msgstr "Un repository chiamato \"%(repo)s\" esiste già" -#: rhodecode/model/validators.py:488 +#: rhodecode/model/validators.py:468 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Un gruppo di repository col nome \"%(repo)s\" esiste già" -#: rhodecode/model/validators.py:491 +#: rhodecode/model/validators.py:471 #, python-format msgid "Repository with name %(repo)s exists in group \"%(group)s\"" msgstr "Un repository chiamato %(repo)s è presente nel gruppo \"%(group)s\"" -#: rhodecode/model/validators.py:493 +#: rhodecode/model/validators.py:473 #, python-format msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "Un gruppo di repository chiamato \"%(repo)s\" è presente nel gruppo \"%(group)s\"" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:566 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219 msgid "Repository name cannot end with .git" msgstr "" -#: rhodecode/model/validators.py:640 +#: rhodecode/model/validators.py:626 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "L'URL per la clonazione non corrisponde ai repository di tipo %(rtype)s " -#: rhodecode/model/validators.py:641 +#: rhodecode/model/validators.py:627 #, python-format msgid "" "Invalid clone url, provide a valid clone url starting with one of " "%(allowed_prefixes)s" msgstr "URL invalido. Fornire un URL che cominci con un prefisso incluso tra %(allowed_prefixes)s" -#: rhodecode/model/validators.py:670 +#: rhodecode/model/validators.py:659 msgid "Fork have to be the same type as parent" msgstr "Un Fork deve essere dello stesso tipo del genitore" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:676 msgid "You do not have the permission to create repositories in this group." msgstr "Non hai permessi per creare repository in questo gruppo." -#: rhodecode/model/validators.py:688 +#: rhodecode/model/validators.py:679 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "" "You do not have the permission to store repositories in the root location." msgstr "Non hai permessi per memorizzare repository nella radice." -#: rhodecode/model/validators.py:748 +#: rhodecode/model/validators.py:739 msgid "This username or user group name is not valid" msgstr "Nome utente o nome gruppo invalidi" -#: rhodecode/model/validators.py:879 +#: rhodecode/model/validators.py:852 msgid "This is not a valid path" msgstr "Questo non è un path valido" -#: rhodecode/model/validators.py:894 +#: rhodecode/model/validators.py:870 msgid "This e-mail address is already taken" msgstr "Indirizzo e-mail già in uso da qualcuno" -#: rhodecode/model/validators.py:914 +#: rhodecode/model/validators.py:892 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "L'e-mail \"%(email)s\" non esiste." -#: rhodecode/model/validators.py:935 +#: rhodecode/model/validators.py:913 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "Le revisioni %(revs)s fanno già parte della richiesta 'Pull' o hanno lo stato" -#: rhodecode/model/validators.py:966 -#: rhodecode/model/validation_schema/validators.py:40 -#: rhodecode/model/validation_schema/validators.py:53 +#: rhodecode/model/validators.py:946 +#: rhodecode/model/validation_schema/validators.py:41 +#: rhodecode/model/validation_schema/validators.py:54 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "Inserire un indirizzo IPv4 o IPv6 valido" -#: rhodecode/model/validators.py:967 +#: rhodecode/model/validators.py:947 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "Il dimensionamento in bit della network deve essere nel range di 0-32 (non %(bits)r)" -#: rhodecode/model/validators.py:994 +#: rhodecode/model/validators.py:975 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "Il nome della chiave può contenere solo lettere, trattini (bassi o medi) o numeri" -#: rhodecode/model/validators.py:1009 +#: rhodecode/model/validators.py:992 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "I plugin %(loaded)s e %(next_to_load)s esportano entrambi lo stesso nome" -#: rhodecode/model/validators.py:1012 +#: rhodecode/model/validators.py:995 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "" -#: rhodecode/model/validators.py:1015 +#: rhodecode/model/validators.py:998 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validators.py:1017 +#: rhodecode/model/validators.py:1000 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validation_schema/validators.py:61 +#: rhodecode/model/validators.py:1068 +msgid "Url must start with http or /" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:62 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:70 +#: rhodecode/model/validation_schema/validators.py:71 msgid "Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/validators.py:132 +#: rhodecode/model/validation_schema/validators.py:133 msgid "" "Invalid clone url, provide a valid clone url starting with one of " "{allowed_prefixes}" msgstr "" -#: rhodecode/model/validation_schema/validators.py:138 +#: rhodecode/model/validation_schema/validators.py:139 msgid "invalid clone url for {repo_type} repository" msgstr "" +#: rhodecode/model/validation_schema/validators.py:148 +msgid "Please enter a valid json object" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -4073,35 +4078,35 @@ msgstr "" msgid "Integration scope" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 msgid "General integration options" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 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:113 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: 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:136 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4141,451 +4146,451 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: 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/rhodecode-components.js:28706 +#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "Nessun risultato" -#: 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/rhodecode-components.js:30637 +#: rhodecode/public/js/scripts.js:22485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: 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/rhodecode-components.js:30638 +#: rhodecode/public/js/scripts.js:22486 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: 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/rhodecode-components.js:30639 +#: rhodecode/public/js/scripts.js:22487 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: 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/rhodecode-components.js:30640 +#: rhodecode/public/js/scripts.js:22488 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: 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/rhodecode-components.js:30641 +#: rhodecode/public/js/scripts.js:22489 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: 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/rhodecode-components.js:30642 +#: rhodecode/public/js/scripts.js:22490 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: 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/rhodecode-components.js:30662 +#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: 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/rhodecode-components.js:30670 +#: rhodecode/public/js/scripts.js:22518 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: 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/rhodecode-components.js:30682 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: 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/rhodecode-components.js:30684 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: 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/rhodecode-components.js:30688 +#: rhodecode/public/js/scripts.js:22536 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: 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/rhodecode-components.js:30690 +#: rhodecode/public/js/scripts.js:22538 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: 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/rhodecode-components.js:30692 +#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: 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-components.js:44751 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: 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-components.js:44754 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: 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-components.js:44757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "Nessuna corrispondenza" -#: 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-components.js:44760 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: 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-components.js:44764 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: 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:43213 -#: rhodecode/public/js/scripts.js:35061 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:44766 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: 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:43218 -#: rhodecode/public/js/scripts.js:35066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:44771 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: 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-components.js:44773 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: 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-components.js:44778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: 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-components.js:44780 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: 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-components.js:44784 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: 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-components.js:44786 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: 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/rhodecode-components.js:45724 +#: rhodecode/public/js/scripts.js:37528 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: 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/rhodecode-components.js:45726 +#: rhodecode/public/js/scripts.js:37530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: 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/rhodecode-components.js:46172 +#: rhodecode/public/js/scripts.js:37976 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: 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/rhodecode-components.js:46191 +#: rhodecode/public/js/scripts.js:37995 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: 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/rhodecode-components.js:46210 +#: rhodecode/public/js/scripts.js:38014 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:44673 -#: rhodecode/public/js/scripts.js:36521 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:46230 +#: rhodecode/public/js/scripts.js:38034 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: 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/rhodecode-components.js:46597 +#: rhodecode/public/js/scripts.js:38401 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: 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/rhodecode-components.js:46681 +#: rhodecode/public/js/scripts.js:38485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: 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/rhodecode-components.js:46696 +#: rhodecode/public/js/scripts.js:38500 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: 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:45296 -#: rhodecode/public/js/scripts.js:37144 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:46853 +#: rhodecode/public/js/scripts.js:38657 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Inoltro..." -#: 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/rhodecode-components.js:46904 +#: rhodecode/public/js/scripts.js:38708 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: 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:45452 -#: rhodecode/public/js/scripts.js:37300 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:538 +#: rhodecode/public/js/rhodecode-components.js:47014 +#: rhodecode/public/js/scripts.js:38818 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/comments.js:543 msgid "Delete this comment?" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47084 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:613 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47161 +#: rhodecode/public/js/scripts.js:38965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode/comments.js:690 msgid "Leave a comment on line {0}." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47275 +#: rhodecode/public/js/scripts.js:39079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/comments.js:804 msgid "TODO from comment {0} was fixed." msgstr "" -#: 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/rhodecode-components.js:47455 +#: rhodecode/public/js/scripts.js:39259 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: 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/rhodecode-components.js:47457 +#: rhodecode/public/js/scripts.js:39261 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: 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/rhodecode-components.js:47466 +#: rhodecode/public/js/scripts.js:39270 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Nessuna corrispondenza tra i file" -#: 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/rhodecode-components.js:47601 +#: rhodecode/public/js/scripts.js:39405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Collegamento selezione" -#: 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/rhodecode-components.js:47641 +#: rhodecode/public/js/scripts.js:39445 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: 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:46106 -#: rhodecode/public/js/scripts.js:37954 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/rhodecode-components.js:47642 +#: rhodecode/public/js/scripts.js:39446 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Smetti di seguire" -#: 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/rhodecode-components.js:47651 +#: rhodecode/public/js/scripts.js:39455 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: 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:46116 -#: rhodecode/public/js/scripts.js:37964 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode-components.js:47652 +#: rhodecode/public/js/scripts.js:39456 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Segui" -#: 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/rhodecode-components.js:48032 +#: rhodecode/public/js/scripts.js:39836 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: 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:46510 -#: rhodecode/public/js/scripts.js:38358 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:48041 +#: rhodecode/public/js/scripts.js:39845 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48046 +#: rhodecode/public/js/scripts.js:39850 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: 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/rhodecode-components.js:48052 +#: rhodecode/public/js/scripts.js:39856 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48068 +#: rhodecode/public/js/scripts.js:39872 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46530 -#: rhodecode/public/js/scripts.js:38378 +#: rhodecode/public/js/rhodecode-components.js:48075 +#: rhodecode/public/js/scripts.js:39879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48082 +#: rhodecode/public/js/scripts.js:39886 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48096 +#: rhodecode/public/js/scripts.js:39900 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48198 +#: rhodecode/public/js/scripts.js:40002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:300 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46823 -#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode-components.js:48204 +#: rhodecode/public/js/scripts.js:40008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +msgid "User `{0}` already in reviewers" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48334 +#: rhodecode/public/js/scripts.js:40138 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:436 msgid "added manually by \"{0}\"" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48338 +#: rhodecode/public/js/scripts.js:40142 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:440 msgid "member of \"{0}\"" msgstr "" -#: 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/rhodecode-components.js:48924 +#: rhodecode/public/js/scripts.js:40728 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: 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/rhodecode-components.js:48944 +#: rhodecode/public/js/scripts.js:40748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: 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 +#: rhodecode/public/js/rhodecode-components.js:49356 +#: rhodecode/public/js/scripts.js:41160 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode.js:574 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 +#: rhodecode/public/js/rhodecode-components.js:49364 +#: rhodecode/public/js/scripts.js:41168 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/src/rhodecode.js:582 msgid "Specified expiration date" msgstr "" @@ -4594,174 +4599,180 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:488 -#: rhodecode/templates/codeblocks/diffs.mako:493 +#: rhodecode/templates/codeblocks/diffs.mako:494 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Add another comment" msgstr "Aggiungi un altro commento" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 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/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No branches available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No forks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No gists available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No repositories available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No repository groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 msgid "No ssh keys available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 msgid "No tags available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 msgid "No user groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No users available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: 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:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 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:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "disabilitato" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "abilitato" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "files" msgstr "i file" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 msgid "{0} out of {1} ssh keys" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 msgid "{0} years" msgstr "" @@ -4835,12 +4846,17 @@ msgstr "Hai i diritti di admin sul gruppo e puoi modificarlo" msgid "Edit Repository Group" msgstr "Modifica il Gruppo di Repository" -#: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:68 +msgid "No repositories or repositories groups exists here." +msgstr "" + +#: rhodecode/templates/index_base.mako:86 +#: rhodecode/templates/index_base.mako:116 #: rhodecode/templates/admin/gists/index.mako:112 #: 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_user_group_membership.mako:39 #: 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 @@ -4857,13 +4873,14 @@ msgstr "Modifica il Gruppo di Repository" msgid "Name" msgstr "Nome" -#: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/index_base.mako:89 +#: rhodecode/templates/index_base.mako:119 #: 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/my_account/my_account_user_group_membership.mako:44 #: 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:55 @@ -4893,20 +4910,21 @@ msgstr "Nome" #: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 -#: rhodecode/templates/summary/components.mako:82 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "Descrizione" -#: rhodecode/templates/index_base.mako:103 -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:92 +#: rhodecode/templates/index_base.mako:122 #: 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/index_base.mako:94 +#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 @@ -4918,11 +4936,11 @@ msgstr "Ultimo cambiamento" #: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:68 -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:209 msgid "Owner" msgstr "Proprietario" -#: rhodecode/templates/index_base.mako:134 +#: rhodecode/templates/index_base.mako:125 #: 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 @@ -4934,7 +4952,7 @@ msgstr "Proprietario" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4951,7 +4969,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:341 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:343 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Autenticati" @@ -4975,7 +4993,7 @@ msgstr "" #: rhodecode/templates/login.mako:68 #: rhodecode/templates/password_reset.mako:37 -#: rhodecode/templates/base/base.mako:46 +#: rhodecode/templates/base/base.mako:48 #: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "Supporto" @@ -5130,7 +5148,7 @@ msgid "Repository" msgstr "Repository" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:77 msgid "Admin audit logs" msgstr "" @@ -5317,7 +5335,7 @@ 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/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 @@ -5391,7 +5409,7 @@ msgstr "Mio Pubblico" #: 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:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5494,8 +5512,8 @@ msgstr "Gruppi di Repository" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: 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:249 +#: rhodecode/templates/base/base.mako:86 +#: rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "Impostazioni" @@ -5598,7 +5616,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:355 +#: rhodecode/templates/base/base.mako:357 msgid "My account" msgstr "il mio Account" @@ -5626,35 +5644,40 @@ msgstr "Tocken autorizzativi" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:36 -msgid "OAuth Identities" +#: rhodecode/templates/admin/my_account/my_account.mako:33 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 +msgid "User Group Membership" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:38 +msgid "OAuth Identities" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "le Email" -#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "Watched" msgstr "Osservato" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:43 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 -#: rhodecode/templates/base/base.mako:239 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "Richieste 'Pull'" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:44 #: 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 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:82 msgid "Permissions" msgstr "Permessi" -#: rhodecode/templates/admin/my_account/my_account.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:45 msgid "Live Notifications" msgstr "" @@ -5880,6 +5903,23 @@ msgid "" "sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +msgid "Click add to use this generate SSH key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 +#: 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: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 +#: rhodecode/templates/admin/users/users.mako:74 +msgid "Active" +msgstr "Attivo" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "I Repository che osservi" @@ -6093,8 +6133,8 @@ msgstr "Aggiungi Gruppo di Repository" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:77 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:153 msgid "Repository groups" msgstr "Gruppi di Repository" @@ -6283,7 +6323,7 @@ msgid "Import Existing Repository ?" msgstr "Importare un repository esistente?" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:196 +#: rhodecode/templates/base/base.mako:198 msgid "Clone from" msgstr "Clona da" @@ -6363,7 +6403,7 @@ msgid "Remote" msgstr "Remoto" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:143 +#: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "Statistiche" @@ -6388,100 +6428,104 @@ msgstr "" msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Attached scoped tokens" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:25 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 msgid "Set" msgstr "Set" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40 msgid "Manually set this repository as a fork of another from the list" msgstr "Imposta manualmente questo repository come fork di un altro della lista" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:49 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 msgid "" "All actions made on this repository will be visible to everyone following " "the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "Conferma sbloccaggio repository." -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "Sblocca repository" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "Conferma il blocco del repository." -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "" "Force repository locking. This only works when anonymous access is disabled." " Pulling from the repository locks the repository to that user until the " "same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "Scollega i fork" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "Cancella i fork" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 #: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Conferma la cancellazione del repository: %s" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 msgid "" "This repository will be renamed in a special way in order to make it " "inaccessible to RhodeCode Enterprise and its VCS systems. If you need to " @@ -6489,11 +6533,11 @@ msgid "" "rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" @@ -6541,17 +6585,6 @@ msgstr "Prefisso" msgid "Key" 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: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 -#: rhodecode/templates/admin/users/users.mako:74 -msgid "Active" -msgstr "Attivo" - #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" @@ -6713,8 +6746,8 @@ msgid "Settings for Repository: %s" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 -msgid "Non-changeable id" -msgstr "ID non modificabile" +msgid "permalink id" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" @@ -6908,7 +6941,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:210 +#: rhodecode/templates/admin/settings/settings_visual.mako:214 msgid "Save settings" msgstr "Salve impostazioni" @@ -7202,6 +7235,14 @@ msgstr "Controllo nuove versioni..." msgid "Gunicorn process management" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:11 +msgid "start auto refresh" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:12 +msgid "stop auto refresh" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -7252,13 +7293,6 @@ msgstr "" msgid "Cleanup sessions" msgstr "" -#: rhodecode/templates/admin/settings/settings_supervisor_tail.mako:1 -#, python-format -msgid "" -"Last %(size)s bytes of process logs, use ?offset=[num] GET param to set " -"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:11 msgid "create summary snapshot" msgstr "" @@ -7414,24 +7448,26 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:170 -msgid "Clone URL" +msgid "Clone URL templates" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:179 +#: rhodecode/templates/admin/settings/settings_visual.mako:181 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" " {user} current user username,\n" +" {sys_user} current system user running this process, usefull for ssh,\n" +" {hostname} hostname of this server running RhodeCode,\n" " {netloc} network location/server host of running RhodeCode server,\n" " {repo} full repository name,\n" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:192 +#: rhodecode/templates/admin/settings/settings_visual.mako:196 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:200 +#: rhodecode/templates/admin/settings/settings_visual.mako:204 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7446,8 +7482,8 @@ msgstr "Aggiungi gruppo utente" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:79 -#: rhodecode/templates/base/base.mako:154 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:156 msgid "User groups" msgstr "Gruppi utente" @@ -7595,7 +7631,7 @@ msgstr "Aggiungi utente" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:80 msgid "Users" msgstr "Utenti" @@ -7859,13 +7895,17 @@ msgstr "" msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:25 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" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 +msgid "Use this generated key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +msgid "Confirmation required on the next screen" msgstr "" #: rhodecode/templates/admin/users/users.mako:5 @@ -7876,174 +7916,174 @@ msgstr "Amministrazione utenti" msgid "Auth type" msgstr "Tipo di Auth" -#: rhodecode/templates/base/base.mako:53 +#: rhodecode/templates/base/base.mako:55 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:83 msgid "Authentication" msgstr "Autenticazione" -#: rhodecode/templates/base/base.mako:83 +#: rhodecode/templates/base/base.mako:85 msgid "Defaults" msgstr "Parametri di default" -#: rhodecode/templates/base/base.mako:101 +#: rhodecode/templates/base/base.mako:103 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:188 +#: rhodecode/templates/base/base.mako:190 msgid "Fork of" msgstr "Fork di" -#: rhodecode/templates/base/base.mako:205 +#: rhodecode/templates/base/base.mako:207 #, python-format msgid "Repository locked by %(user)s" msgstr "Repository bloccato da %(user)s" -#: rhodecode/templates/base/base.mako:210 +#: rhodecode/templates/base/base.mako:212 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:228 +#: rhodecode/templates/base/base.mako:230 #: 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/base/base.mako:231 #: 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/base/base.mako:232 #: 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:231 +#: rhodecode/templates/base/base.mako:233 #: 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:235 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostra le richieste PULL da %s" -#: rhodecode/templates/base/base.mako:245 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Opzioni" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: 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/base/base.mako:269 +#: rhodecode/templates/base/base.mako:413 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Ricerca" -#: rhodecode/templates/base/base.mako:271 +#: rhodecode/templates/base/base.mako:273 msgid "Unlock" msgstr "Sblocca" -#: rhodecode/templates/base/base.mako:273 +#: rhodecode/templates/base/base.mako:275 msgid "Lock" msgstr "Blocca" -#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/base/base.mako:280 #: 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:279 +#: rhodecode/templates/base/base.mako:281 msgid "Create Pull Request" msgstr "Crea richiesta di PULL" -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:303 msgid "Sign in" msgstr "Accedi" -#: rhodecode/templates/base/base.mako:309 +#: rhodecode/templates/base/base.mako:311 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "Accedi al tuo account" -#: rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/base/base.mako:328 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "(Password dimenticata?)" -#: rhodecode/templates/base/base.mako:336 +#: rhodecode/templates/base/base.mako:338 msgid "Don't have an account?" msgstr "Non possiedi un account?" -#: rhodecode/templates/base/base.mako:338 +#: rhodecode/templates/base/base.mako:340 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:357 +#: rhodecode/templates/base/base.mako:359 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:361 +#: rhodecode/templates/base/base.mako:363 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:393 +#: rhodecode/templates/base/base.mako:395 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:396 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:15 msgid "Journal" msgstr "Journal" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:401 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:402 msgid "Public journal" msgstr "Journal pubblico" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:407 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:408 msgid "Gists" msgstr "i Gist" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:412 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/base/base.mako:418 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:433 -#: rhodecode/templates/base/base.mako:434 +#: rhodecode/templates/base/base.mako:435 +#: rhodecode/templates/base/base.mako:436 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8065,15 +8105,15 @@ msgstr "" msgid "Style" msgstr "Stile" -#: rhodecode/templates/base/base.mako:491 +#: rhodecode/templates/base/base.mako:493 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:546 msgid "Keyboard shortcuts" msgstr "Scorciatoie da tastiera" -#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:554 msgid "Site-wide shortcuts" msgstr "Scorciatoie per tutto il sito" @@ -8180,8 +8220,8 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:274 -#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:325 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8526,10 +8566,10 @@ msgid "Compare Selected Bookmarks" msgstr "confronta i Segnalibri Selezionati" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changelog/changelog_elements.mako:121 #: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 -#: rhodecode/templates/summary/summary_commits.mako:62 +#: rhodecode/templates/summary/summary_commits.mako:68 #, python-format msgid "Bookmark %s" msgstr "Segnalibro %s" @@ -8548,10 +8588,10 @@ msgid "Compare Selected Branches" msgstr "confronta i Branch Selezionati" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changelog/changelog_elements.mako:113 #: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 -#: rhodecode/templates/summary/summary_commits.mako:76 +#: rhodecode/templates/summary/summary_commits.mako:82 #, python-format msgid "Branch %s" msgstr "Branch %s" @@ -8616,79 +8656,79 @@ msgstr "Nessun cambiamento" msgid "load previous" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/summary/summary_commits.mako:21 +#: rhodecode/templates/changelog/changelog_elements.mako:32 +#: rhodecode/templates/summary/summary_commits.mako:27 #, python-format msgid "" "Commit status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/summary/summary_commits.mako:25 +#: rhodecode/templates/changelog/changelog_elements.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: {}" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/summary/summary_commits.mako:31 +#: rhodecode/templates/changelog/changelog_elements.mako:42 +#: rhodecode/templates/summary/summary_commits.mako:37 msgid "Commit status: Not Reviewed" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/summary/summary_commits.mako:36 +#: rhodecode/templates/changelog/changelog_elements.mako:47 +#: rhodecode/templates/summary/summary_commits.mako:42 msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changelog/changelog_elements.mako:58 #: rhodecode/templates/changeset/changeset.mako:42 msgid "Copy the full commit id" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changelog/changelog_elements.mako:65 #: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:72 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: rhodecode/templates/changeset/changeset.mako:50 #: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:72 #: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: 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/changelog/changelog_elements.mako:83 +#: rhodecode/templates/compare/compare_commits.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "Espandi il messaggio commit" -#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changelog/changelog_elements.mako:107 #: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "merge" -#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 -#: rhodecode/templates/summary/summary_commits.mako:69 +#: rhodecode/templates/summary/summary_commits.mako:75 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "Tag %s" -#: rhodecode/templates/changelog/changelog_elements.mako:137 +#: rhodecode/templates/changelog/changelog_elements.mako:143 msgid "load next" msgstr "" @@ -8723,7 +8763,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:81 +#: rhodecode/templates/changeset/changeset_file_comment.mako:82 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8739,8 +8779,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:445 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:451 +#: rhodecode/templates/codeblocks/diffs.mako:454 msgid "Raw diff" msgstr "diff semplice" @@ -8757,8 +8797,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:452 -#: rhodecode/templates/codeblocks/diffs.mako:455 +#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:461 msgid "Download diff" msgstr "Download diff" @@ -8782,103 +8822,103 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:32 +#: rhodecode/templates/changeset/changeset_file_comment.mako:33 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:39 +#: rhodecode/templates/changeset/changeset_file_comment.mako:40 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:66 -#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:67 +#: rhodecode/templates/changeset/changeset_file_comment.mako:69 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:73 +#: rhodecode/templates/changeset/changeset_file_comment.mako:74 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:88 +#: rhodecode/templates/changeset/changeset_file_comment.mako:89 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 msgid "Pull request author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +#: rhodecode/templates/changeset/changeset_file_comment.mako:98 msgid "author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:105 +#: rhodecode/templates/changeset/changeset_file_comment.mako:106 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:109 -#: rhodecode/templates/changeset/changeset_file_comment.mako:124 +#: rhodecode/templates/changeset/changeset_file_comment.mako:110 +#: rhodecode/templates/changeset/changeset_file_comment.mako:125 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:121 +#: rhodecode/templates/changeset/changeset_file_comment.mako:122 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:151 -#: rhodecode/templates/changeset/changeset_file_comment.mako:154 -msgid "Prev" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:152 #: rhodecode/templates/changeset/changeset_file_comment.mako:155 +msgid "Prev" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:153 +#: rhodecode/templates/changeset/changeset_file_comment.mako:156 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:191 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:193 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:195 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: 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:65 +msgid "You need to be logged in to leave comments." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Autenticati ora" -#: rhodecode/templates/changeset/changeset_file_comment.mako:348 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "" "Use @username inside this text to send notification to this RhodeCode user" msgstr "Usa @username all'interno del testo per notificare l'utente RhodeCode." -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 +#: rhodecode/templates/changeset/changeset_file_comment.mako:352 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:368 +#: rhodecode/templates/changeset/changeset_file_comment.mako:369 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Chiuso" -#: rhodecode/templates/changeset/changeset_file_comment.mako:398 +#: rhodecode/templates/changeset/changeset_file_comment.mako:399 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8975,71 +9015,71 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:290 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/codeblocks/diffs.mako:356 #: 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 +#: rhodecode/templates/codeblocks/diffs.mako:421 +#: rhodecode/templates/codeblocks/diffs.mako:437 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:417 -#: rhodecode/templates/codeblocks/diffs.mako:424 +#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:430 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:422 -#: rhodecode/templates/codeblocks/diffs.mako:438 +#: rhodecode/templates/codeblocks/diffs.mako:428 +#: rhodecode/templates/codeblocks/diffs.mako:444 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:433 -#: rhodecode/templates/codeblocks/diffs.mako:440 +#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:446 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:643 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:651 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:649 +#: rhodecode/templates/codeblocks/diffs.mako:655 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:650 +#: rhodecode/templates/codeblocks/diffs.mako:656 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:660 +#: rhodecode/templates/codeblocks/diffs.mako:666 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:664 +#: rhodecode/templates/codeblocks/diffs.mako:670 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:668 +#: rhodecode/templates/codeblocks/diffs.mako:674 msgid "Wide Mode Diff" msgstr "" @@ -9056,11 +9096,11 @@ msgid "Compare was calculated based on this shared commit." msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:78 msgid "No commits in this compare" msgstr "" @@ -9631,7 +9671,7 @@ msgid "Close File List" msgstr "" #: rhodecode/templates/files/files_browser.mako:25 -#: rhodecode/templates/summary/summary_commits.mako:103 +#: rhodecode/templates/summary/summary_commits.mako:109 msgid "Add New File" msgstr "Aggiungi Nuovo File" @@ -9907,12 +9947,12 @@ msgid "Pull request reviewers" msgstr "Revisori della richiesta PULL" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 msgid "Add reviewer or reviewer group" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:504 +#: rhodecode/templates/pullrequests/pullrequest.mako:508 msgid "Please select source and target" msgstr "" @@ -9920,19 +9960,19 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:364 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:368 +#: rhodecode/templates/pullrequests/pullrequest.mako:371 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:431 +#: rhodecode/templates/pullrequests/pullrequest.mako:435 msgid "Target repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:441 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Select commit reference" msgstr "" @@ -9993,8 +10033,7 @@ msgid "Merge" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:140 -#: rhodecode/templates/summary/components.mako:53 -#: rhodecode/templates/summary/components.mako:69 +#: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" @@ -10074,85 +10113,81 @@ msgid "Pull request versions not available" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 msgid "Save Changes" msgstr "Salva i Cambiamenti" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 -msgid "Mandatory reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 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:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 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:431 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 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:442 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update commits" msgstr "Aggiorna i commit" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 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:482 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:593 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:596 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 msgid "show them" msgstr "" @@ -10263,74 +10298,59 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/components.mako:49 -msgid "Read-only url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -#: rhodecode/templates/summary/components.mako:72 +#: rhodecode/templates/summary/components.mako:71 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:76 +msgid "Copy the clone by ssh url" +msgstr "" -#: 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 +#: rhodecode/templates/summary/components.mako:80 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:65 -msgid "Clone url" -msgstr "Clona url" - -#: rhodecode/templates/summary/components.mako:94 +#: rhodecode/templates/summary/components.mako:100 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:110 +#: rhodecode/templates/summary/components.mako:116 msgid "Number of Repository Forks" msgstr "" -#: rhodecode/templates/summary/components.mako:118 +#: rhodecode/templates/summary/components.mako:124 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:149 +#: rhodecode/templates/summary/components.mako:155 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:153 +#: rhodecode/templates/summary/components.mako:159 msgid "Statistics are disabled for this repository" msgstr "Le statistiche sono state disabilitate su questo repository" -#: rhodecode/templates/summary/components.mako:156 +#: rhodecode/templates/summary/components.mako:162 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:167 +#: rhodecode/templates/summary/components.mako:173 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:173 +#: rhodecode/templates/summary/components.mako:179 msgid "There are no downloads yet" msgstr "Non ci sono download" -#: rhodecode/templates/summary/components.mako:177 +#: rhodecode/templates/summary/components.mako:183 msgid "Downloads are disabled for this repository" msgstr "Download disabilitati sul repository" -#: rhodecode/templates/summary/components.mako:180 +#: rhodecode/templates/summary/components.mako:186 msgid "enable downloads" msgstr "" @@ -10363,15 +10383,15 @@ msgstr "%s feed ATOM" msgid "%s RSS feed" msgstr "%s feed RSS" -#: rhodecode/templates/summary/summary_commits.mako:100 +#: rhodecode/templates/summary/summary_commits.mako:106 msgid "Add or upload files directly via RhodeCode:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:111 +#: rhodecode/templates/summary/summary_commits.mako:117 msgid "Push new repo:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:128 msgid "Existing repository?" msgstr "Repository esistente?" @@ -10399,9 +10419,3 @@ msgstr "" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" msgstr "" - -#: rhodecode/tests/lib/test_ext_json.py:163 -msgid "singular" -msgid_plural "plural" -msgstr[0] "" -msgstr[1] "" diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo index 3eeefbe8..226568cb 100644 Binary files a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo and b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo differ diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po index 6e7da9a7..f172b29e 100644 --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po @@ -1,5 +1,5 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2017 RhodeCode GmbH +# Copyright (C) 2018 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-11-03 16:42+0100\n" -"PO-Revision-Date: 2017-11-03 15:43+0000\n" +"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"PO-Revision-Date: 2018-01-30 16:33+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Japanese (http://www.transifex.com/rhodecode/RhodeCode/language/ja/)\n" "MIME-Version: 1.0\n" @@ -27,32 +27,53 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/apps/_base/__init__.py:142 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "リポジトリ %s 作成中にエラーが発生しました: 無効な証明書です" + +#: rhodecode/apps/_base/__init__.py:146 +#, python-format +msgid "Error creating repository %s" +msgstr "リポジトリ %s の作成中にエラーが発生しました" + +#: rhodecode/apps/_base/__init__.py:219 +#, python-format +msgid "" +"The repository `%(repo_name)s` cannot be loaded in filesystem. Please check " +"if it exist, or is not damaged." +msgstr "" + +#: rhodecode/apps/_base/__init__.py:274 +msgid "Editing user `{}` is disabled." +msgstr "" + +#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "全般" -#: rhodecode/apps/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:74 #: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "VCS" -#: rhodecode/apps/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:76 msgid "Visual" msgstr "表示" -#: rhodecode/apps/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:78 msgid "Remap and Rescan" msgstr "再マップと再スキャン" -#: rhodecode/apps/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:80 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "問題追跡システム" -#: rhodecode/apps/admin/navigation.py:89 -#: rhodecode/integrations/types/email.py:232 +#: rhodecode/apps/admin/navigation.py:82 +#: rhodecode/integrations/types/email.py:233 #: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 @@ -64,15 +85,15 @@ msgstr "問題追跡システム" msgid "Email" msgstr "メールアドレス" -#: rhodecode/apps/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:84 msgid "Hooks" msgstr "フック" -#: rhodecode/apps/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:86 msgid "Full Text Search" msgstr "全文検索" -#: rhodecode/apps/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:88 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -86,28 +107,28 @@ msgstr "全文検索" #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 #: rhodecode/templates/admin/repos/repo_edit.mako:75 -#: rhodecode/templates/base/base.mako:82 +#: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "インテグレーション" -#: rhodecode/apps/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:90 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "システム情報" -#: rhodecode/apps/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:92 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:94 msgid "User Sessions" msgstr "" -#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/apps/admin/navigation.py:96 msgid "Open Source Licenses" msgstr "オープンソースライセンス" -#: rhodecode/apps/admin/navigation.py:109 +#: rhodecode/apps/admin/navigation.py:101 msgid "Labs" msgstr "ラボ" @@ -119,13 +140,13 @@ msgstr "デフォルト設定の更新に成功しました" msgid "Error occurred during update of default values" msgstr "デフォルト値の更新中にエラーが発生しました" -#: rhodecode/apps/admin/views/permissions.py:121 +#: rhodecode/apps/admin/views/permissions.py:120 msgid "Application permissions updated successfully" msgstr "アプリケーションの権限の更新に成功しました" -#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:141 #: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:287 +#: rhodecode/apps/admin/views/permissions.py:288 msgid "Error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" @@ -133,11 +154,11 @@ msgstr "権限の更新中にエラーが発生しました" msgid "Object permissions updated successfully" msgstr "オブジェクトの権限の更新に成功しました" -#: rhodecode/apps/admin/views/permissions.py:267 +#: rhodecode/apps/admin/views/permissions.py:268 msgid "Global permissions updated successfully" msgstr "全般の権限の更新に成功しました" -#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/apps/admin/views/permissions.py:450 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:208 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -158,20 +179,20 @@ msgstr "全般の権限の更新に成功しました" msgid "Edit" msgstr "編集" -#: rhodecode/apps/admin/views/permissions.py:476 +#: rhodecode/apps/admin/views/permissions.py:478 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:479 +#: rhodecode/apps/admin/views/permissions.py:481 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:180 +#: rhodecode/apps/admin/views/repo_groups.py:181 #, python-format msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: rhodecode/apps/admin/views/repo_groups.py:198 +#: rhodecode/apps/admin/views/repo_groups.py:199 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "リポジトリグループ %s の作成中にエラーが発生しました" @@ -180,10 +201,86 @@ msgstr "リポジトリグループ %s の作成中にエラーが発生しま msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/apps/admin/views/sessions.py:98 +#: rhodecode/apps/admin/views/sessions.py:97 msgid "Failed to cleanup up old sessions" msgstr "" +#: rhodecode/apps/admin/views/settings.py:162 +#: rhodecode/apps/admin/views/settings.py:708 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +msgid "Some form inputs contain invalid data." +msgstr "フォーム入力に無効なデータが含まれています" + +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:351 +msgid "Error occurred during updating application settings" +msgstr "アプリケーション設定の更新中にエラーが発生しました" + +#: rhodecode/apps/admin/views/settings.py:194 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +msgid "Updated VCS settings" +msgstr "VCS設定を更新しました" + +#: rhodecode/apps/admin/views/settings.py:268 +#, python-format +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s" + +#: rhodecode/apps/admin/views/settings.py:347 +msgid "Updated application settings" +msgstr "アプリケーション設定を更新しました" + +#: rhodecode/apps/admin/views/settings.py:426 +msgid "Updated visualisation settings" +msgstr "表示設定を更新しました" + +#: rhodecode/apps/admin/views/settings.py:429 +msgid "Error occurred during updating visualisation settings" +msgstr "表示設定の更新中にエラーが発生しました" + +#: rhodecode/apps/admin/views/settings.py:491 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +msgid "Invalid issue tracker pattern: {}" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:508 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +msgid "Updated issue tracker entries" +msgstr "問題追跡システムのエントリを更新しました" + +#: rhodecode/apps/admin/views/settings.py:526 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 +msgid "Removed issue tracker entry" +msgstr "問題追跡システムのエントリを削除しました" + +#: rhodecode/apps/admin/views/settings.py:563 +msgid "Please enter email address" +msgstr "メールアドレスを入力してください" + +#: rhodecode/apps/admin/views/settings.py:581 +msgid "Send email task created" +msgstr "メール送信タスクを作成しました" + +#: rhodecode/apps/admin/views/settings.py:631 +msgid "Added new hook" +msgstr "新しいフックを追加しました" + +#: rhodecode/apps/admin/views/settings.py:646 +msgid "Updated hooks" +msgstr "フックを更新しました" + +#: rhodecode/apps/admin/views/settings.py:650 +msgid "Error occurred during hook creation" +msgstr "フックの作成中にエラーが発生しました" + +#: rhodecode/apps/admin/views/settings.py:732 +msgid "Error occurred during updating labs settings" +msgstr "ラボ設定の更新中にエラーが発生しました" + +#: rhodecode/apps/admin/views/settings.py:737 +msgid "Updated Labs settings" +msgstr "ラボ設定を更新しました" + #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" @@ -192,149 +289,153 @@ msgstr "" msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/apps/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:79 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:102 +#: rhodecode/apps/admin/views/system_info.py:90 msgid "Update info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:104 +#: rhodecode/apps/admin/views/system_info.py:92 msgid "Check for updates" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:97 msgid "RhodeCode Version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:110 +#: rhodecode/apps/admin/views/system_info.py:98 +msgid "Latest version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:99 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:111 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:112 +#: rhodecode/apps/admin/views/system_info.py:101 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "RhodeCode Certificate" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:103 msgid "Workers" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:115 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Worker Type" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "Database" msgstr "データーベース" -#: rhodecode/apps/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:109 msgid "Database version" msgstr "データーベースバージョン" -#: rhodecode/apps/admin/views/system_info.py:124 +#: rhodecode/apps/admin/views/system_info.py:113 msgid "Platform" msgstr "プラットフォーム" -#: rhodecode/apps/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Platform UUID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Python version" msgstr "Python バージョン" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:116 msgid "Python path" msgstr "Python パス" -#: rhodecode/apps/admin/views/system_info.py:131 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "CPU" msgstr "CPU" -#: rhodecode/apps/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Load" msgstr "Load" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Memory" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:123 msgid "Uptime" msgstr "稼働時間" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Storage location" msgstr "ストレージの場所" -#: rhodecode/apps/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Storage inodes" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "Gist storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Gist storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Archive cache storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:148 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Temp storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:149 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Temp storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Search info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Search location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:156 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "VCS Backends" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:157 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "VCS Server" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:158 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "GIT" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:159 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "HG" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:160 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "SVN" msgstr "" @@ -348,188 +449,188 @@ msgstr "ユーザーグループ %(user_group_link)s を作成しました" msgid "Error occurred during creation of user group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:208 +#: rhodecode/apps/admin/views/users.py:209 #, python-format msgid "Created user %(user_link)s" msgstr "ユーザー %(user_link)s を作成しました" -#: rhodecode/apps/admin/views/users.py:229 +#: rhodecode/apps/admin/views/users.py:230 #, python-format msgid "Error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:303 +#: rhodecode/apps/admin/views/users.py:304 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: rhodecode/apps/admin/views/users.py:321 -#: rhodecode/apps/my_account/views/my_account.py:485 +#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/my_account/views/my_account.py:490 #, python-format msgid "Error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:353 +#: rhodecode/apps/admin/views/users.py:354 #, python-format msgid "Detached %s repositories" msgstr "%s 個のリポジトリを切り離しました" -#: rhodecode/apps/admin/views/users.py:358 +#: rhodecode/apps/admin/views/users.py:359 #, python-format msgid "Deleted %s repositories" msgstr " %s 個のリポジトリを削除しました" -#: rhodecode/apps/admin/views/users.py:366 +#: rhodecode/apps/admin/views/users.py:367 #, python-format msgid "Detached %s repository groups" msgstr "%s 個のリポジトリグループを切り離しました" -#: rhodecode/apps/admin/views/users.py:371 +#: rhodecode/apps/admin/views/users.py:372 #, python-format msgid "Deleted %s repository groups" msgstr "%s 個のリポジトリグループを削除しました" -#: rhodecode/apps/admin/views/users.py:379 +#: rhodecode/apps/admin/views/users.py:380 #, python-format msgid "Detached %s user groups" msgstr "%s 個のユーザーグループを切り離しました" -#: rhodecode/apps/admin/views/users.py:384 +#: rhodecode/apps/admin/views/users.py:385 #, python-format msgid "Deleted %s user groups" msgstr "%s 個のユーザーグループを削除しました" -#: rhodecode/apps/admin/views/users.py:401 +#: rhodecode/apps/admin/views/users.py:402 msgid "Successfully deleted user" msgstr "ユーザーの削除に成功しました" -#: rhodecode/apps/admin/views/users.py:407 +#: rhodecode/apps/admin/views/users.py:408 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:473 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 +#: rhodecode/apps/admin/views/users.py:479 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 +#: rhodecode/apps/admin/views/users.py:567 msgid "User global permissions updated successfully" msgstr "ユーザーの全般の権限の更新に成功しました" -#: rhodecode/apps/admin/views/users.py:583 -#: rhodecode/apps/user_group/views/__init__.py:472 +#: rhodecode/apps/admin/views/users.py:585 +#: rhodecode/apps/user_group/views/__init__.py:448 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:608 +#: rhodecode/apps/admin/views/users.py:610 msgid "Force password change disabled for user" msgstr "パスワード変更強制を無効化しました" -#: rhodecode/apps/admin/views/users.py:613 +#: rhodecode/apps/admin/views/users.py:615 msgid "Force password change enabled for user" msgstr "パスワード変更強制を有効化しました" -#: rhodecode/apps/admin/views/users.py:622 +#: rhodecode/apps/admin/views/users.py:624 msgid "An error occurred during password reset for user" msgstr "パスワードのリセット中にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:661 +#: rhodecode/apps/admin/views/users.py:663 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:667 +#: rhodecode/apps/admin/views/users.py:669 #, python-format msgid "Created repository group `%s`" msgstr "リポジトリグループ `%s` を作成しました" -#: rhodecode/apps/admin/views/users.py:671 +#: rhodecode/apps/admin/views/users.py:673 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:676 +#: rhodecode/apps/admin/views/users.py:678 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/apps/admin/views/users.py:701 +#: rhodecode/apps/my_account/views/my_account.py:160 #: 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:737 -#: rhodecode/apps/my_account/views/my_account.py:193 +#: rhodecode/apps/admin/views/users.py:739 +#: rhodecode/apps/my_account/views/my_account.py:194 msgid "Auth token successfully created" msgstr "認証トークンの作成に成功しました" -#: rhodecode/apps/admin/views/users.py:766 -#: rhodecode/apps/my_account/views/my_account.py:217 +#: rhodecode/apps/admin/views/users.py:768 +#: rhodecode/apps/my_account/views/my_account.py:218 msgid "Auth token successfully deleted" msgstr "認証トークンの削除に成功しました" -#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/admin/views/users.py:840 #: 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/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:849 #: 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/admin/views/users.py:883 #: 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 +#: rhodecode/apps/admin/views/users.py:929 +#: rhodecode/apps/my_account/views/my_account.py:260 #, python-format msgid "Added new email address `%s` for user account" msgstr "ユーザーアカウントに新しいメールアドレス `%s` を追加しました" -#: rhodecode/apps/admin/views/users.py:928 +#: rhodecode/apps/admin/views/users.py:935 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 +#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/my_account/views/my_account.py:266 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:959 +#: rhodecode/apps/admin/views/users.py:966 msgid "Removed email address from user account" msgstr "ユーザーアカウントからメールアドレスを削除しました" -#: rhodecode/apps/admin/views/users.py:1005 +#: rhodecode/apps/admin/views/users.py:1012 #, python-format msgid "An error occurred during ip saving:%s" msgstr "IP アドレスの保存中にエラーが発生しました: %s" -#: rhodecode/apps/admin/views/users.py:1023 +#: rhodecode/apps/admin/views/users.py:1034 msgid "An error occurred during ip saving" msgstr "IPアドレスの保存中にエラーが発生しました" -#: rhodecode/apps/admin/views/users.py:1027 +#: rhodecode/apps/admin/views/users.py:1038 #, python-format msgid "Added ips %s to user whitelist" msgstr "ユーザーホワイトリストに IP アドレス %s を追加しました" -#: rhodecode/apps/admin/views/users.py:1057 +#: rhodecode/apps/admin/views/users.py:1068 msgid "Removed ip address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: rhodecode/apps/admin/views/users.py:1122 +#: rhodecode/apps/admin/views/users.py:1133 msgid "Groups successfully changed" msgstr "" @@ -554,10 +655,10 @@ 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 +#: rhodecode/public/js/rhodecode-components.js:49320 +#: rhodecode/public/js/scripts.js:41124 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/src/rhodecode.js:538 msgid "Lifetime" msgstr "有効期間" @@ -608,75 +709,75 @@ msgstr "Gist {} の更新中にエラーが発生しました: {}" 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/apps/home/views.py:218 rhodecode/apps/home/views.py:251 +#: rhodecode/apps/repository/views/repo_pull_requests.py:719 +#: rhodecode/templates/admin/my_account/my_account.mako:41 #: 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:580 +#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:150 +#: rhodecode/templates/base/base.mako:582 msgid "Repositories" msgstr "リポジトリ" -#: rhodecode/apps/home/views.py:241 +#: rhodecode/apps/home/views.py:244 msgid "Groups" msgstr "グループ" -#: rhodecode/apps/home/views.py:261 +#: rhodecode/apps/home/views.py:264 #, python-format msgid "Commits in %(repo)s" msgstr "%(repo)s のコミット" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "公開ジャーナル" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 msgid "journal" msgstr "ジャーナル" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:281 +#: rhodecode/apps/login/views.py:288 msgid "You have successfully registered with RhodeCode" msgstr "RhodeCode に登録されました" -#: rhodecode/apps/login/views.py:317 +#: rhodecode/apps/login/views.py:325 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:323 +#: rhodecode/apps/login/views.py:331 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:412 +#: rhodecode/apps/login/views.py:420 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:428 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "パスワードリセットが成功しました、新しいパスワードをあなたのメールアドレスに送信しました" -#: rhodecode/apps/my_account/views/my_account.py:134 +#: rhodecode/apps/my_account/views/my_account.py:135 msgid "Error occurred during update of user password" msgstr "ユーザーパスワードの更新中にエラーが発生しました" -#: rhodecode/apps/my_account/views/my_account.py:141 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "パスワードの更新に成功しました" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:288 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:465 +#: rhodecode/apps/my_account/views/my_account.py:470 msgid "Your account was updated successfully" msgstr "アカウントの更新に成功しました" @@ -691,7 +792,7 @@ 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 +#: rhodecode/apps/user_group/views/__init__.py:328 msgid "Cannot change permission for yourself as admin" msgstr "自分自身の管理者の権限を変更できません" @@ -718,28 +819,28 @@ msgstr "キャッシュの無効化中にエラーが発生しました" #: 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:585 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_commits.py:192 #: 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 +#: rhodecode/apps/repository/views/repo_checks.py:98 #, python-format msgid "Created repository %s from %s" msgstr "リポジトリ %s を %s から作成しました" -#: rhodecode/apps/repository/views/repo_checks.py:104 +#: rhodecode/apps/repository/views/repo_checks.py:107 #, python-format msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォークしました" -#: rhodecode/apps/repository/views/repo_checks.py:107 +#: rhodecode/apps/repository/views/repo_checks.py:110 #, python-format msgid "Created repository %s" msgstr "リポジトリ %s を作成しました" @@ -768,13 +869,13 @@ msgstr "差分の範囲を拡大" msgid "Increase context for all diffs" msgstr "すべての差分で範囲を拡大" -#: rhodecode/apps/repository/views/repo_commits.py:389 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#: rhodecode/apps/repository/views/repo_commits.py:388 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1129 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "状態変更 %(transition_icon)s %(status)s" -#: rhodecode/apps/repository/views/repo_commits.py:433 +#: rhodecode/apps/repository/views/repo_commits.py:432 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -856,14 +957,14 @@ 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/apps/repository/views/repo_summary.py:322 +#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 #: 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 +#: rhodecode/model/scm.py:804 rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "タグ" @@ -924,12 +1025,12 @@ msgid "" "the path" msgstr "場所の指定は相対かつ .. を含まないパスでなければなりません" -#: rhodecode/apps/repository/views/repo_forks.py:144 -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "フォークを比較" -#: rhodecode/apps/repository/views/repo_forks.py:250 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" @@ -938,91 +1039,88 @@ msgstr "リポジトリ %s のフォーク中にエラーが発生しました" msgid "Repository permissions updated" msgstr "リポジトリ権限を更新しました" -#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +#: rhodecode/apps/repository/views/repo_pull_requests.py:615 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:750 msgid "Error creating pull request: {}" msgstr "プルリクエスト作成エラー: {}" -#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +#: rhodecode/apps/repository/views/repo_pull_requests.py:775 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +#: rhodecode/apps/repository/views/repo_pull_requests.py:790 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +#: rhodecode/apps/repository/views/repo_pull_requests.py:841 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストの作成に成功しました" -#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +#: rhodecode/apps/repository/views/repo_pull_requests.py:844 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +#: rhodecode/apps/repository/views/repo_pull_requests.py:875 +#: rhodecode/apps/repository/views/repo_pull_requests.py:905 msgid "Cannot update closed pull requests." msgstr "終了したプルリクエストは更新できません" -#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +#: rhodecode/apps/repository/views/repo_pull_requests.py:911 msgid "Pull request title & description updated." msgstr "プルリクエストのタイトルと説明を更新しました。" -#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:946 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1010 msgid "Pull request was successfully merged and closed." msgstr "プルリクエストはマージに成功し終了しました。" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1034 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1060 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: rhodecode/apps/repository/views/repo_settings.py:167 +#: rhodecode/apps/repository/views/repo_settings.py:168 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:193 +#: rhodecode/apps/repository/views/repo_settings.py:194 msgid "Unlocked" msgstr "アンロック" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:199 msgid "Locked" msgstr "ロック" -#: rhodecode/apps/repository/views/repo_settings.py:200 +#: rhodecode/apps/repository/views/repo_settings.py:201 #, python-format msgid "Repository has been %s" msgstr "リポジトリは %s されています" -#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings.py:205 #: rhodecode/apps/repository/views/repo_settings_advanced.py:230 msgid "An error occurred during unlocking" msgstr "アンロック中にエラーが発生しました" -#: rhodecode/apps/repository/views/repo_settings.py:248 +#: rhodecode/apps/repository/views/repo_settings.py:249 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" @@ -1085,28 +1183,18 @@ msgstr "リポジトリをロックしました" msgid "Unlocked repository" msgstr "リポジトリのロックを解除しました" -#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +#: rhodecode/apps/repository/views/repo_settings_fields.py:86 msgid "An error occurred during creation of field" msgstr "フィールドの作成中にエラーが発生しました" -#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +#: rhodecode/apps/repository/views/repo_settings_fields.py:108 msgid "An error occurred during removal of field" msgstr "フィールドの削除中にエラーが発生しました" -#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86 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 "リモートから取得" @@ -1115,34 +1203,23 @@ msgstr "リモートから取得" 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 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Branch" msgstr "ブランチ" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Tag" msgstr "タグ" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:299 msgid "Bookmark" msgstr "ブックマーク" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:323 msgid "Closed branches" msgstr "閉鎖済みブランチ" @@ -1154,41 +1231,41 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:209 +#: rhodecode/apps/user_group/views/__init__.py:184 #, python-format msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: rhodecode/apps/user_group/views/__init__.py:231 +#: rhodecode/apps/user_group/views/__init__.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: rhodecode/apps/user_group/views/__init__.py:257 +#: rhodecode/apps/user_group/views/__init__.py:232 msgid "Successfully deleted user group" msgstr "ユーザーグループの削除に成功しました" -#: rhodecode/apps/user_group/views/__init__.py:262 +#: rhodecode/apps/user_group/views/__init__.py:237 msgid "An error occurred during deletion of user group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: rhodecode/apps/user_group/views/__init__.py:366 +#: rhodecode/apps/user_group/views/__init__.py:341 msgid "Target group cannot be the same" msgstr "対象に同じ物を選ぶことはできません" -#: rhodecode/apps/user_group/views/__init__.py:381 +#: rhodecode/apps/user_group/views/__init__.py:356 msgid "User Group permissions updated" msgstr "ユーザーグループ権限を更新しました" -#: rhodecode/apps/user_group/views/__init__.py:452 +#: rhodecode/apps/user_group/views/__init__.py:428 msgid "User Group global permissions updated successfully" msgstr "ユーザーグループの全般の権限の更新に成功しました" -#: rhodecode/apps/user_group/views/__init__.py:534 +#: rhodecode/apps/user_group/views/__init__.py:510 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:538 +#: rhodecode/apps/user_group/views/__init__.py:514 msgid "An error occurred during synchronization update" msgstr "" @@ -1215,20 +1292,20 @@ msgstr "" msgid "Auth Cache TTL" msgstr "認証キャッシュ有効期間" -#: rhodecode/authentication/views.py:90 +#: rhodecode/authentication/views.py:93 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "プラグインの設定保存時にエラーが発生しました。フォームの入力を確認してください。" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:170 msgid "Auth settings updated successfully." msgstr "認証設定の更新に成功しました。" -#: rhodecode/authentication/views.py:181 +#: rhodecode/authentication/views.py:173 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "プラグインの設定保存時にエラーが発生しました。フォームの入力を確認してください。" -#: rhodecode/authentication/views.py:191 +#: rhodecode/authentication/views.py:181 msgid "Error occurred during update of auth settings." msgstr "認証設定の更新時にエラーが発生しました。" @@ -1353,11 +1430,11 @@ msgid "Password to authenticate for given user DN." msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 -#: rhodecode/integrations/types/webhook.py:214 +#: rhodecode/integrations/types/webhook.py:220 #: 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:324 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "パスワード" @@ -1481,56 +1558,6 @@ msgstr "Rhodecode" msgid "Rhodecode Token Auth" msgstr "Rhodecodeトークン認証" -#: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:286 -msgid "Error occurred during updating application settings" -msgstr "アプリケーション設定の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/settings.py:226 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s" - -#: rhodecode/controllers/admin/settings.py:282 -msgid "Updated application settings" -msgstr "アプリケーション設定を更新しました" - -#: rhodecode/controllers/admin/settings.py:348 -msgid "Updated visualisation settings" -msgstr "表示設定を更新しました" - -#: rhodecode/controllers/admin/settings.py:351 -msgid "Error occurred during updating visualisation settings" -msgstr "表示設定の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/settings.py:444 -msgid "Please enter email address" -msgstr "メールアドレスを入力してください" - -#: rhodecode/controllers/admin/settings.py:462 -msgid "Send email task created" -msgstr "メール送信タスクを作成しました" - -#: rhodecode/controllers/admin/settings.py:495 -msgid "Added new hook" -msgstr "新しいフックを追加しました" - -#: rhodecode/controllers/admin/settings.py:510 -msgid "Updated hooks" -msgstr "フックを更新しました" - -#: rhodecode/controllers/admin/settings.py:514 -msgid "Error occurred during hook creation" -msgstr "フックの作成中にエラーが発生しました" - -#: rhodecode/controllers/admin/settings.py:643 -msgid "Error occurred during updating labs settings" -msgstr "ラボ設定の更新中にエラーが発生しました" - -#: rhodecode/controllers/admin/settings.py:648 -msgid "Updated Labs settings" -msgstr "ラボ設定を更新しました" - #: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "プルリクエストの作成" @@ -1555,35 +1582,35 @@ msgstr "プルリクエストのマージ" msgid "pullrequest commented" msgstr "プルリクエストのコメント" -#: rhodecode/events/repo.py:149 +#: rhodecode/events/repo.py:189 msgid "repository pre create" msgstr "リポジトリの作成準備" -#: rhodecode/events/repo.py:158 +#: rhodecode/events/repo.py:198 msgid "repository created" msgstr "リポジトリの作成" -#: rhodecode/events/repo.py:167 +#: rhodecode/events/repo.py:207 msgid "repository pre delete" msgstr "リポジトリの削除準備" -#: rhodecode/events/repo.py:176 +#: rhodecode/events/repo.py:216 msgid "repository deleted" msgstr "リポジトリの削除" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:256 msgid "repository pre pull" msgstr "リポジトリのプル準備" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:265 msgid "repository pull" msgstr "リポジトリのプル" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:274 msgid "repository pre push" msgstr "リポジトリのプッシュ準備" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:285 msgid "repository push" msgstr "リポジトリのプッシュ" @@ -1634,7 +1661,7 @@ msgstr "ユーザーの更新準備" #: 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:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:215 #: 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 @@ -1662,9 +1689,9 @@ msgstr "リセット" #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: 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/changeset/changeset_file_comment.mako:143 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:148 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1727,81 +1754,81 @@ msgstr "{name} インテグレーション" msgid "Integration {integration_name} deleted successfully." msgstr "インテグレーション {integration_name} の削除に成功しました。" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:302 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "インテグレーションの設定保存時にエラーが発生しました。フォームの入力を確認してください。" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:327 msgid "Integration {integration_name} updated successfully." msgstr "インテグレーション {integration_name} の更新に成功しました。" -#: rhodecode/integrations/types/email.py:214 +#: rhodecode/integrations/types/email.py:215 msgid "Recipients" msgstr "受信者" -#: rhodecode/integrations/types/email.py:215 +#: rhodecode/integrations/types/email.py:216 msgid "Email addresses to send push events to" msgstr "プッシュイベントの送信先のメールアドレス" -#: rhodecode/integrations/types/email.py:220 #: rhodecode/integrations/types/email.py:221 +#: rhodecode/integrations/types/email.py:222 msgid "Email address" msgstr "メールアドレス" -#: rhodecode/integrations/types/email.py:233 +#: rhodecode/integrations/types/email.py:234 msgid "Send repo push summaries to a list of recipients via email" msgstr "プッシュのサマリーをメール受信者リストに送信する" -#: rhodecode/integrations/types/hipchat.py:43 +#: rhodecode/integrations/types/hipchat.py:41 msgid "Yellow" msgstr "黄" -#: rhodecode/integrations/types/hipchat.py:44 +#: rhodecode/integrations/types/hipchat.py:42 msgid "Red" msgstr "赤" -#: rhodecode/integrations/types/hipchat.py:45 +#: rhodecode/integrations/types/hipchat.py:43 msgid "Green" msgstr "緑" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Purple" msgstr "紫" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Gray" msgstr "灰" -#: rhodecode/integrations/types/hipchat.py:52 +#: rhodecode/integrations/types/hipchat.py:50 msgid "Hipchat server URL" msgstr "Hipchat サーバ URL" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:51 msgid "Hipchat integration url." msgstr "Hipchat インテグレーション URL。" -#: rhodecode/integrations/types/hipchat.py:63 +#: rhodecode/integrations/types/hipchat.py:61 msgid "Notify" msgstr "通知" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:62 msgid "Make a notification to the users in room." msgstr "部屋にいるユーザーに通知する。" -#: rhodecode/integrations/types/hipchat.py:70 +#: rhodecode/integrations/types/hipchat.py:68 msgid "Color" msgstr "色" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:69 msgid "Background color of message." msgstr "メッセージの背景色。" -#: rhodecode/integrations/types/hipchat.py:99 +#: rhodecode/integrations/types/hipchat.py:97 msgid "Hipchat" msgstr "Hipchat" -#: rhodecode/integrations/types/hipchat.py:100 +#: rhodecode/integrations/types/hipchat.py:98 msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "リポジトリのプッシュやプルリクエストなどのイベントを Hipchat チャンネルに送信する。" @@ -1817,7 +1844,7 @@ msgid "" msgstr "Slack app manager でセットアップできます" #: rhodecode/integrations/types/slack.py:60 -#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/integrations/types/webhook.py:210 #: 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 @@ -1828,7 +1855,7 @@ msgstr "Slack ap #: 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:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1864,11 +1891,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "Slack のチャンネルにリポジトリのプッシュやプルリクエストなどのイベントを送信する。" -#: rhodecode/integrations/types/webhook.py:177 +#: rhodecode/integrations/types/webhook.py:183 msgid "Webhook URL" msgstr "Webhook URL" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:185 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 " @@ -1876,53 +1903,53 @@ msgid "" "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:199 msgid "Secret Token" msgstr "シークレットトークン" -#: rhodecode/integrations/types/webhook.py:194 +#: rhodecode/integrations/types/webhook.py:200 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 +#: rhodecode/integrations/types/webhook.py:211 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:215 +#: rhodecode/integrations/types/webhook.py:221 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:225 +#: rhodecode/integrations/types/webhook.py:231 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:226 +#: rhodecode/integrations/types/webhook.py:232 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:235 +#: rhodecode/integrations/types/webhook.py:241 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:236 +#: rhodecode/integrations/types/webhook.py:242 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:245 +#: rhodecode/integrations/types/webhook.py:251 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:246 +#: rhodecode/integrations/types/webhook.py:252 msgid "Select if the Webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:259 +#: rhodecode/integrations/types/webhook.py:265 msgid "Webhook" msgstr "Webhook" -#: rhodecode/integrations/types/webhook.py:260 +#: rhodecode/integrations/types/webhook.py:266 msgid "Post json events to a Webhook endpoint" msgstr "" @@ -2010,80 +2037,63 @@ msgstr "リポジトリの[フォローを開始]" msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/action_parser.py:171 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "フォーク名 %s" -#: rhodecode/lib/action_parser.py:189 +#: rhodecode/lib/action_parser.py:191 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "プルリクエスト #%s" -#: rhodecode/lib/action_parser.py:223 +#: rhodecode/lib/action_parser.py:226 #, python-format msgid "Show all combined commits %s->%s" msgstr "%s から %s までのすべてのコミットを表示" -#: rhodecode/lib/action_parser.py:228 +#: rhodecode/lib/action_parser.py:231 msgid "compare view" msgstr "比較ビュー" -#: rhodecode/lib/action_parser.py:235 +#: rhodecode/lib/action_parser.py:238 #, python-format msgid " and %(num)s more commits" msgstr "と %(num)s 以上のコミット" -#: rhodecode/lib/action_parser.py:288 +#: rhodecode/lib/action_parser.py:293 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: rhodecode/lib/action_parser.py:291 +#: rhodecode/lib/action_parser.py:296 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: rhodecode/lib/action_parser.py:304 +#: rhodecode/lib/action_parser.py:309 msgid "Commit not found" msgstr "コミットが見つかりません" -#: rhodecode/lib/auth.py:1445 +#: rhodecode/lib/auth.py:1441 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: rhodecode/lib/auth.py:1535 +#: rhodecode/lib/auth.py:1531 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" -#: rhodecode/lib/auth.py:1577 +#: rhodecode/lib/auth.py:1575 msgid "You need to be signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" -#: rhodecode/lib/diffs.py:62 -msgid "Click to comment" -msgstr "コメント" - -#: rhodecode/lib/diffs.py:77 -msgid "Binary file" -msgstr "バイナリファイル" - -#: rhodecode/lib/diffs.py:98 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください" - -#: rhodecode/lib/diffs.py:109 -msgid "No changes detected" -msgstr "検出された変更はありません" - -#: rhodecode/lib/diffs.py:927 +#: rhodecode/lib/diffs.py:864 msgid "Click to select line" msgstr "行を選択" -#: rhodecode/lib/helpers.py:1869 +#: rhodecode/lib/helpers.py:1855 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2103,7 +2113,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1893 +#: rhodecode/lib/helpers.py:1879 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2117,49 +2127,49 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1910 +#: rhodecode/lib/helpers.py:1896 #, 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:525 +#: rhodecode/lib/utils2.py:524 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:531 +#: rhodecode/lib/utils2.py:530 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:540 +#: rhodecode/lib/utils2.py:539 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:542 +#: rhodecode/lib/utils2.py:541 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:544 +#: rhodecode/lib/utils2.py:543 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:546 +#: rhodecode/lib/utils2.py:545 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:548 +#: rhodecode/lib/utils2.py:547 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:550 +#: rhodecode/lib/utils2.py:549 msgid "in ${val} and ${detail}" msgstr "" -#: 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/lib/utils2.py:553 +#: rhodecode/public/js/rhodecode-components.js:30702 +#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "たったいま" @@ -2187,6 +2197,7 @@ msgstr "たったいま" #: 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_11_0_0.py:2599 #: 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 @@ -2195,7 +2206,7 @@ msgstr "たったいま" #: 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 +#: rhodecode/model/db.py:2626 msgid "Repository no access" msgstr "リポジトリへのアクセス権限無し" @@ -2222,6 +2233,7 @@ msgstr "リポジトリへのアクセス権限無し" #: 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_11_0_0.py:2600 #: 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 @@ -2230,7 +2242,7 @@ msgstr "リポジトリへのアクセス権限無し" #: 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 +#: rhodecode/model/db.py:2627 msgid "Repository read access" msgstr "リポジトリに読込権限でアクセス" @@ -2257,6 +2269,7 @@ msgstr "リポジトリに読込権限でアクセス" #: 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_11_0_0.py:2601 #: 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 @@ -2265,7 +2278,7 @@ msgstr "リポジトリに読込権限でアクセス" #: 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 +#: rhodecode/model/db.py:2628 msgid "Repository write access" msgstr "リポジトリに書込権限でアクセス" @@ -2292,6 +2305,7 @@ msgstr "リポジトリに書込権限でアクセス" #: 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_11_0_0.py:2602 #: 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 @@ -2300,7 +2314,7 @@ msgstr "リポジトリに書込権限でアクセス" #: 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 +#: rhodecode/model/db.py:2629 msgid "Repository admin access" msgstr "リポジトリに管理権限でアクセス" @@ -2367,6 +2381,7 @@ msgstr "RhodeCode 管理者" #: 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_11_0_0.py:2620 #: 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 @@ -2375,7 +2390,7 @@ msgstr "RhodeCode 管理者" #: 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 +#: rhodecode/model/db.py:2647 msgid "Repository creation disabled" msgstr "リポジトリの作成を有効にする" @@ -2402,6 +2417,7 @@ msgstr "リポジトリの作成を有効にする" #: 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_11_0_0.py:2621 #: 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 @@ -2410,7 +2426,7 @@ msgstr "リポジトリの作成を有効にする" #: 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 +#: rhodecode/model/db.py:2648 msgid "Repository creation enabled" msgstr "リポジトリの作成を有効にする" @@ -2437,6 +2453,7 @@ msgstr "リポジトリの作成を有効にする" #: 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_11_0_0.py:2625 #: 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 @@ -2445,7 +2462,7 @@ msgstr "リポジトリの作成を有効にする" #: 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 +#: rhodecode/model/db.py:2652 msgid "Repository forking disabled" msgstr "リポジトリのフォークを無効にする" @@ -2472,6 +2489,7 @@ msgstr "リポジトリのフォークを無効にする" #: 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_11_0_0.py:2626 #: 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 @@ -2480,7 +2498,7 @@ msgstr "リポジトリのフォークを無効にする" #: 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 +#: rhodecode/model/db.py:2653 msgid "Repository forking enabled" msgstr "リポジトリのフォークを有効にする" @@ -2528,6 +2546,7 @@ msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベ #: 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_11_0_0.py:3328 #: 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 @@ -2536,7 +2555,11 @@ msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベ #: 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 +#: rhodecode/model/db.py:3355 +#: rhodecode/public/js/rhodecode-components.js:48211 +#: rhodecode/public/js/scripts.js:40015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "Not Reviewed" msgstr "未レビュー" @@ -2563,6 +2586,7 @@ msgstr "未レビュー" #: 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_11_0_0.py:3329 #: 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 @@ -2571,7 +2595,7 @@ msgstr "未レビュー" #: 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 +#: rhodecode/model/db.py:3356 msgid "Approved" msgstr "承認" @@ -2598,6 +2622,7 @@ msgstr "承認" #: 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_11_0_0.py:3330 #: 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 @@ -2606,7 +2631,7 @@ msgstr "承認" #: 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 +#: rhodecode/model/db.py:3357 msgid "Rejected" msgstr "却下" @@ -2633,6 +2658,7 @@ msgstr "却下" #: 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_11_0_0.py:3331 #: 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 @@ -2641,7 +2667,7 @@ msgstr "却下" #: 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 +#: rhodecode/model/db.py:3358 msgid "Under Review" msgstr "レビュー中" @@ -2665,6 +2691,7 @@ msgstr "レビュー中" #: 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_11_0_0.py:2604 #: 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 @@ -2673,7 +2700,7 @@ msgstr "レビュー中" #: 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 +#: rhodecode/model/db.py:2631 msgid "Repository group no access" msgstr "リポジトリグループへのアクセス権限なし" @@ -2697,6 +2724,7 @@ msgstr "リポジトリグループへのアクセス権限なし" #: 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_11_0_0.py:2605 #: 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 @@ -2705,7 +2733,7 @@ msgstr "リポジトリグループへのアクセス権限なし" #: 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 +#: rhodecode/model/db.py:2632 msgid "Repository group read access" msgstr "リポジトリグループに読込権限でアクセス" @@ -2729,6 +2757,7 @@ msgstr "リポジトリグループに読込権限でアクセス" #: 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_11_0_0.py:2606 #: 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 @@ -2737,7 +2766,7 @@ msgstr "リポジトリグループに読込権限でアクセス" #: 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 +#: rhodecode/model/db.py:2633 msgid "Repository group write access" msgstr "リポジトリグループに書込権限でアクセス" @@ -2761,6 +2790,7 @@ msgstr "リポジトリグループに書込権限でアクセス" #: 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_11_0_0.py:2607 #: 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 @@ -2769,7 +2799,7 @@ msgstr "リポジトリグループに書込権限でアクセス" #: 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 +#: rhodecode/model/db.py:2634 msgid "Repository group admin access" msgstr "リポジトリグループに管理権限でアクセス" @@ -2792,6 +2822,7 @@ msgstr "リポジトリグループに管理権限でアクセス" #: 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_11_0_0.py:2609 #: 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 @@ -2800,7 +2831,7 @@ msgstr "リポジトリグループに管理権限でアクセス" #: 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 +#: rhodecode/model/db.py:2636 msgid "User group no access" msgstr "ユーザーグループへのアクセス権限なし" @@ -2823,6 +2854,7 @@ msgstr "ユーザーグループへのアクセス権限なし" #: 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_11_0_0.py:2610 #: 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 @@ -2831,7 +2863,7 @@ msgstr "ユーザーグループへのアクセス権限なし" #: 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 +#: rhodecode/model/db.py:2637 msgid "User group read access" msgstr "ユーザーグループに読込権限でアクセス" @@ -2854,6 +2886,7 @@ msgstr "ユーザーグループに読込権限でアクセス" #: 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_11_0_0.py:2611 #: 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 @@ -2862,7 +2895,7 @@ msgstr "ユーザーグループに読込権限でアクセス" #: 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 +#: rhodecode/model/db.py:2638 msgid "User group write access" msgstr "ユーザーグループに書込権限でアクセス" @@ -2885,6 +2918,7 @@ msgstr "ユーザーグループに書込権限でアクセス" #: 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_11_0_0.py:2612 #: 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 @@ -2893,7 +2927,7 @@ msgstr "ユーザーグループに書込権限でアクセス" #: 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 +#: rhodecode/model/db.py:2639 msgid "User group admin access" msgstr "ユーザーグループに管理権限でアクセス" @@ -2916,6 +2950,7 @@ msgstr "ユーザーグループに管理権限でアクセス" #: 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_11_0_0.py:2614 #: 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 @@ -2924,7 +2959,7 @@ msgstr "ユーザーグループに管理権限でアクセス" #: 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 +#: rhodecode/model/db.py:2641 msgid "Repository Group creation disabled" msgstr "リポジトリグループの作成を無効にする" @@ -2947,6 +2982,7 @@ msgstr "リポジトリグループの作成を無効にする" #: 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_11_0_0.py:2615 #: 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 @@ -2955,7 +2991,7 @@ msgstr "リポジトリグループの作成を無効にする" #: 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 +#: rhodecode/model/db.py:2642 msgid "Repository Group creation enabled" msgstr "リポジトリグループの作成を有効にする" @@ -2978,6 +3014,7 @@ msgstr "リポジトリグループの作成を有効にする" #: 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_11_0_0.py:2617 #: 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 @@ -2986,7 +3023,7 @@ msgstr "リポジトリグループの作成を有効にする" #: 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 +#: rhodecode/model/db.py:2644 msgid "User Group creation disabled" msgstr "ユーザーグループの作成を無効にする" @@ -3009,6 +3046,7 @@ msgstr "ユーザーグループの作成を無効にする" #: 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_11_0_0.py:2618 #: 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 @@ -3017,7 +3055,7 @@ msgstr "ユーザーグループの作成を無効にする" #: 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 +#: rhodecode/model/db.py:2645 msgid "User Group creation enabled" msgstr "ユーザーグループの作成を有効にする" @@ -3040,6 +3078,7 @@ msgstr "ユーザーグループの作成を有効にする" #: 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_11_0_0.py:2628 #: 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 @@ -3048,7 +3087,7 @@ msgstr "ユーザーグループの作成を有効にする" #: 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 +#: rhodecode/model/db.py:2655 msgid "Registration disabled" msgstr "新規登録を無効にする" @@ -3071,6 +3110,7 @@ msgstr "新規登録を無効にする" #: 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_11_0_0.py:2629 #: 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 @@ -3079,7 +3119,7 @@ msgstr "新規登録を無効にする" #: 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 +#: rhodecode/model/db.py:2656 msgid "User Registration with manual account activation" msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" @@ -3102,6 +3142,7 @@ msgstr "ユーザーの新規登録時に手動でアカウントをアクティ #: 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_11_0_0.py:2630 #: 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 @@ -3110,7 +3151,7 @@ msgstr "ユーザーの新規登録時に手動でアカウントをアクティ #: 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 +#: rhodecode/model/db.py:2657 msgid "User Registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" @@ -3133,6 +3174,7 @@ msgstr "ユーザーの新規登録時に自動でアカウントをアクティ #: 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_11_0_0.py:2636 #: 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 @@ -3141,7 +3183,7 @@ msgstr "ユーザーの新規登録時に自動でアカウントをアクティ #: 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 +#: rhodecode/model/db.py:2663 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "外部アカウントを手動でアクティベートする" @@ -3164,6 +3206,7 @@ msgstr "外部アカウントを手動でアクティベートする" #: 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_11_0_0.py:2637 #: 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 @@ -3172,7 +3215,7 @@ msgstr "外部アカウントを手動でアクティベートする" #: 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 +#: rhodecode/model/db.py:2664 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "外部アカウントを自動でアクティベートする" @@ -3189,6 +3232,7 @@ msgstr "外部アカウントを自動でアクティベートする" #: 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_11_0_0.py:2622 #: 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 @@ -3197,7 +3241,7 @@ msgstr "外部アカウントを自動でアクティベートする" #: 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 +#: rhodecode/model/db.py:2649 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" @@ -3215,6 +3259,7 @@ msgstr "リポジトリグループの書き込みパーミッションを使っ #: 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_11_0_0.py:2623 #: 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 @@ -3223,7 +3268,7 @@ msgstr "リポジトリグループの書き込みパーミッションを使っ #: 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 +#: rhodecode/model/db.py:2650 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" @@ -3238,6 +3283,7 @@ msgstr "リポジトリグループの書き込みパーミッションを使っ #: 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_11_0_0.py:2597 #: 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 @@ -3246,7 +3292,7 @@ msgstr "リポジトリグループの書き込みパーミッションを使っ #: 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 +#: rhodecode/model/db.py:2624 msgid "RhodeCode Super Administrator" msgstr "" @@ -3258,6 +3304,7 @@ msgstr "" #: 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_11_0_0.py:2639 #: 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 @@ -3266,7 +3313,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2666 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3278,6 +3325,7 @@ msgstr "" #: 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_11_0_0.py:2640 #: 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 @@ -3286,10 +3334,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2667 msgid "Inherit object permissions from default user enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 #: 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 @@ -3298,10 +3347,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: 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 +#: rhodecode/model/db.py:1107 msgid "all" msgstr "すべて" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3310,10 +3360,11 @@ msgstr "すべて" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: 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 +#: rhodecode/model/db.py:1108 msgid "http/web interface" msgstr "HTTP/Web インターフェース" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3322,10 +3373,11 @@ msgstr "HTTP/Web インターフェース" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: 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 +#: rhodecode/model/db.py:1109 msgid "vcs (git/hg/svn protocol)" msgstr "VCS (git/hg/svn プロトコル)" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3334,10 +3386,11 @@ msgstr "VCS (git/hg/svn プロトコル)" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: 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 +#: rhodecode/model/db.py:1110 msgid "api calls" msgstr "API 呼び出し" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 #: 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 @@ -3346,10 +3399,11 @@ msgstr "API 呼び出し" #: 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 +#: rhodecode/model/db.py:1111 msgid "feed access" msgstr "フィードへのアクセス" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 #: 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 @@ -3358,60 +3412,51 @@ msgstr "フィードへのアクセス" #: 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 +#: rhodecode/model/db.py:2387 msgid "No parent" msgstr "親がありません" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 #: 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 +#: rhodecode/model/db.py:2659 msgid "Password reset enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 #: 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 +#: rhodecode/model/db.py:2660 msgid "Password reset hidden" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 #: 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 +#: rhodecode/model/db.py:2661 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:150 -msgid "Invalid search query. Try quoting it." -msgstr "無効な検索クエリーです。\\\"で囲んで下さい" - -#: rhodecode/lib/index/whoosh.py:152 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" - -#: rhodecode/lib/index/whoosh.py:157 -msgid "An error occurred during this search operation" -msgstr "検索を実行する際にエラーが発生しました" - -#: rhodecode/lib/index/whoosh.py:165 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "インデックスタイプ" -#: rhodecode/lib/index/whoosh.py:166 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "ファイルインデックス" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "インデックス化されたドキュメント" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "最後の更新" -#: rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "コミットインデックス" @@ -3431,28 +3476,28 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:382 msgid "made a comment" msgstr "コミットを作成する" -#: rhodecode/model/comment.py:376 +#: rhodecode/model/comment.py:383 msgid "Show it now" msgstr "表示する" -#: rhodecode/model/forms.py:87 +#: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "ログイン名を入力してください" -#: rhodecode/model/forms.py:88 +#: rhodecode/model/forms.py:89 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "%(min)i 文字以上必要です" -#: rhodecode/model/forms.py:98 +#: rhodecode/model/forms.py:99 msgid "Please enter a password" msgstr "パスワードを入力してください" -#: rhodecode/model/forms.py:99 +#: rhodecode/model/forms.py:100 #, python-format msgid "Enter %(min)i characters or more" msgstr "%(min)i 文字以上必要です" @@ -3539,8 +3584,8 @@ msgstr "読込" #: 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 -#: rhodecode/templates/changeset/changeset_file_comment.mako:321 +#: rhodecode/templates/changeset/changeset_file_comment.mako:272 +#: rhodecode/templates/changeset/changeset_file_comment.mako:322 msgid "Write" msgstr "書込" @@ -3574,8 +3619,8 @@ 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:417 -#: rhodecode/templates/base/base.mako:424 +#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:426 msgid "Admin" msgstr "管理" @@ -3692,115 +3737,79 @@ msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1218 msgid "Server-side pull request merging is disabled." msgstr "サーバでのプルリクエストのマージは無効化されています。" -#: rhodecode/model/pull_request.py:1168 +#: rhodecode/model/pull_request.py:1220 msgid "This pull request is closed." msgstr "このプルリクエストはクローズしました。" -#: rhodecode/model/pull_request.py:1181 +#: rhodecode/model/pull_request.py:1233 msgid "Pull request merging is not supported." msgstr "プルリクエストのマージはサポートされていません。" -#: rhodecode/model/pull_request.py:1200 +#: rhodecode/model/pull_request.py:1252 msgid "Target repository large files support is disabled." msgstr "ターゲットリポジトリのラージファイル拡張は無効化されています。" -#: rhodecode/model/pull_request.py:1203 +#: rhodecode/model/pull_request.py:1255 msgid "Source repository large files support is disabled." msgstr "ソースリポジトリのラージファイル拡張は無効化されています。" -#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 +#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/model/pull_request.py:1370 +#: rhodecode/model/pull_request.py:1425 msgid "Commit IDs" msgstr "コミットID" -#: rhodecode/model/pull_request.py:1373 +#: rhodecode/model/pull_request.py:1428 msgid "Closed Branches" msgstr "閉鎖済みブランチ" -#: rhodecode/model/pull_request.py:1533 +#: rhodecode/model/pull_request.py:1588 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1546 +#: rhodecode/model/pull_request.py:1601 msgid "Pull request reviewer approval is pending." msgstr "プルリクエストはレビュワーの承認待ちです。" -#: rhodecode/model/pull_request.py:1561 +#: rhodecode/model/pull_request.py:1616 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1564 +#: rhodecode/model/pull_request.py:1619 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1599 +#: rhodecode/model/pull_request.py:1654 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1604 +#: rhodecode/model/pull_request.py:1659 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1611 +#: rhodecode/model/pull_request.py:1666 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1613 +#: rhodecode/model/pull_request.py:1668 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:762 +#: rhodecode/model/scm.py:775 msgid "latest tip" msgstr "最新のtip" -#: rhodecode/model/user.py:166 -msgid "You can't Edit this user since it's crucial for entire application" -msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" - -#: 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:506 -msgid "You can't remove this user since it's crucial for entire application" -msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。" - -#: 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: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:532 -#, python-format -msgid "" -"user \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups:%s" -msgstr "ユーザー \"%s\" はまだ %s 個のユーザーグループの所有者のため削除することはできません。ユーザーグループの所有者を変更するか削除してください: %s" - -#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99 +#: rhodecode/model/validators.py:92 rhodecode/model/validators.py:93 msgid "Value cannot be an empty list" msgstr "空のリストにはできません" -#: rhodecode/model/validators.py:142 +#: rhodecode/model/validators.py:139 msgid "Pattern already exists" msgstr "パターンがすでに存在します" @@ -3821,30 +3830,26 @@ msgid "" "dashes and must begin with alphanumeric character or underscore" msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必要があります" -#: rhodecode/model/validators.py:192 -msgid "The input is not valid" -msgstr "入力が正しくありません" - -#: rhodecode/model/validators.py:199 +#: rhodecode/model/validators.py:195 #, python-format msgid "Username %(username)s is not valid" msgstr "ユーザー名 %(username)s は不正です" -#: rhodecode/model/validators.py:200 +#: rhodecode/model/validators.py:196 #, python-format msgid "Username %(username)s is disabled" msgstr "ユーザー名 %(username)s は無効です" -#: rhodecode/model/validators.py:223 +#: rhodecode/model/validators.py:221 msgid "Invalid user group name" msgstr "不正なユーザーグループ名です" -#: rhodecode/model/validators.py:224 +#: rhodecode/model/validators.py:222 #, python-format msgid "User group `%(usergroup)s` already exists" msgstr "" -#: rhodecode/model/validators.py:226 +#: rhodecode/model/validators.py:224 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -3872,166 +3877,166 @@ msgstr "この場所にリポジトリグループを格納する権限があり msgid "no permission to store repository group in root location" msgstr "この場所にリポジトリグループを格納する権限がありません" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:387 msgid "Invalid characters (non-ascii) in password" msgstr "パスワードに利用出来ない文字列(non-ascii)です" -#: rhodecode/model/validators.py:401 -msgid "Invalid old password" -msgstr "不正な古いパスワードです" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:406 msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: rhodecode/model/validators.py:436 +#: rhodecode/model/validators.py:426 msgid "invalid password" msgstr "不正なパスワードです" -#: rhodecode/model/validators.py:437 +#: rhodecode/model/validators.py:427 msgid "invalid user name" msgstr "不正なユーザー名です" -#: rhodecode/model/validators.py:438 +#: rhodecode/model/validators.py:428 msgid "Your account is disabled" msgstr "アカウントは無効です" -#: rhodecode/model/validators.py:470 -msgid "Token mismatch" -msgstr "トークンが一致しません" - -#: rhodecode/model/validators.py:484 +#: rhodecode/model/validators.py:464 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "リポジトリ名 %(repo)s は許可されていません" -#: rhodecode/model/validators.py:486 +#: rhodecode/model/validators.py:466 #, python-format msgid "Repository with name %(repo)s already exists" msgstr "リポジトリ %(repo)s はすでに存在します" -#: rhodecode/model/validators.py:488 +#: rhodecode/model/validators.py:468 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します" -#: rhodecode/model/validators.py:491 +#: rhodecode/model/validators.py:471 #, python-format msgid "Repository with name %(repo)s exists in group \"%(group)s\"" msgstr "リポジトリ %(repo)s は グループ %(group)s にすでに存在します" -#: rhodecode/model/validators.py:493 +#: rhodecode/model/validators.py:473 #, python-format msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "リポジトリグループ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:566 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219 msgid "Repository name cannot end with .git" msgstr "" -#: rhodecode/model/validators.py:640 +#: rhodecode/model/validators.py:626 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "%(rtype)s リポジトリの不正なクローン URL " -#: rhodecode/model/validators.py:641 +#: rhodecode/model/validators.py:627 #, python-format msgid "" "Invalid clone url, provide a valid clone url starting with one of " "%(allowed_prefixes)s" msgstr "不正なクローン URL です、 %(allowed_prefixes)s のどれかで始まる有効なクローン URL を入力してください" -#: rhodecode/model/validators.py:670 +#: rhodecode/model/validators.py:659 msgid "Fork have to be the same type as parent" msgstr "フォークは親と同じ種別の必要があります" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:676 msgid "You do not have the permission to create repositories in this group." msgstr "このグループにリポジトリを作成する権限がありません" -#: rhodecode/model/validators.py:688 +#: rhodecode/model/validators.py:679 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "" "You do not have the permission to store repositories in the root location." msgstr "ルートにリポジトリを格納する権限がありません。" -#: rhodecode/model/validators.py:748 +#: rhodecode/model/validators.py:739 msgid "This username or user group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: rhodecode/model/validators.py:879 +#: rhodecode/model/validators.py:852 msgid "This is not a valid path" msgstr "不正なパスです" -#: rhodecode/model/validators.py:894 +#: rhodecode/model/validators.py:870 msgid "This e-mail address is already taken" msgstr "このメールアドレスはすでに取得されています" -#: rhodecode/model/validators.py:914 +#: rhodecode/model/validators.py:892 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "メールアドレス \"%(email)s\" は存在しません" -#: rhodecode/model/validators.py:935 +#: rhodecode/model/validators.py:913 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "リビジョン %(revs)s はすでにプルリクエストの一部かステータスが設定されています" -#: rhodecode/model/validators.py:966 -#: rhodecode/model/validation_schema/validators.py:40 -#: rhodecode/model/validation_schema/validators.py:53 +#: rhodecode/model/validators.py:946 +#: rhodecode/model/validation_schema/validators.py:41 +#: rhodecode/model/validation_schema/validators.py:54 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "有効なIPv4かIPv6のアドレスを入力してください" -#: rhodecode/model/validators.py:967 +#: rhodecode/model/validators.py:947 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不正です)" -#: rhodecode/model/validators.py:994 +#: rhodecode/model/validators.py:975 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "キー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数字しか使えません。" -#: rhodecode/model/validators.py:1009 +#: rhodecode/model/validators.py:992 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "%(loaded)s プラグインと %(next_to_load)s プラグインで同じ名前が使われています" -#: rhodecode/model/validators.py:1012 +#: rhodecode/model/validators.py:995 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "プラグイン \"%(plugin_id)s\" に includeme 関数がありません。" -#: rhodecode/model/validators.py:1015 +#: rhodecode/model/validators.py:998 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "プラグイン \"%(plugin_id)s\" をロードできません" -#: rhodecode/model/validators.py:1017 +#: rhodecode/model/validators.py:1000 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "ID \"%(plugin_id)s\" で利用可能なプラグインがありません" -#: rhodecode/model/validation_schema/validators.py:61 +#: rhodecode/model/validators.py:1068 +msgid "Url must start with http or /" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:62 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:70 +#: rhodecode/model/validation_schema/validators.py:71 msgid "Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/validators.py:132 +#: rhodecode/model/validation_schema/validators.py:133 msgid "" "Invalid clone url, provide a valid clone url starting with one of " "{allowed_prefixes}" msgstr "" -#: rhodecode/model/validation_schema/validators.py:138 +#: rhodecode/model/validation_schema/validators.py:139 msgid "invalid clone url for {repo_type} repository" msgstr "" +#: rhodecode/model/validation_schema/validators.py:148 +msgid "Please enter a valid json object" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -4080,35 +4085,35 @@ msgstr "インテグレーションのスコープ。 Recursive を指定する msgid "Integration scope" msgstr "インテグレーションのスコープ" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 msgid "General integration options" msgstr "一般インテグレーションオプション" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 msgid "{integration_type} settings" msgstr "{integration_type} 設定" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 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:113 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: 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:136 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4148,451 +4153,451 @@ msgstr "パスワードが正しくありません" msgid "New password must be different to old password" msgstr "新しいパスワードは古いパスワードと異なるものでないといけません" -#: 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/rhodecode-components.js:28706 +#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "結果がありません" -#: 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/rhodecode-components.js:30637 +#: rhodecode/public/js/scripts.js:22485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "{0} 年" -#: 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/rhodecode-components.js:30638 +#: rhodecode/public/js/scripts.js:22486 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "{0} ヶ月" -#: 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/rhodecode-components.js:30639 +#: rhodecode/public/js/scripts.js:22487 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "{0} 日" -#: 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/rhodecode-components.js:30640 +#: rhodecode/public/js/scripts.js:22488 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "{0} 時間" -#: 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/rhodecode-components.js:30641 +#: rhodecode/public/js/scripts.js:22489 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "{0} 分" -#: 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/rhodecode-components.js:30642 +#: rhodecode/public/js/scripts.js:22490 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "{0} 秒" -#: 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/rhodecode-components.js:30662 +#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: 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/rhodecode-components.js:30670 +#: rhodecode/public/js/scripts.js:22518 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "{0} 前" -#: 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/rhodecode-components.js:30682 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: 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/rhodecode-components.js:30684 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: 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/rhodecode-components.js:30688 +#: rhodecode/public/js/scripts.js:22536 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: 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/rhodecode-components.js:30690 +#: rhodecode/public/js/scripts.js:22538 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: 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/rhodecode-components.js:30692 +#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: 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-components.js:44751 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "結果を読み込み中..." -#: 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-components.js:44754 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "検索中..." -#: 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-components.js:44757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "一致するものが見つかりません" -#: 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-components.js:44760 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "読み込み失敗" -#: 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-components.js:44764 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: 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:43213 -#: rhodecode/public/js/scripts.js:35061 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:44766 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: 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:43218 -#: rhodecode/public/js/scripts.js:35066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:44771 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "{0} 文字以上入力してください" -#: 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-components.js:44773 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "{0} 文字以上入力してください" -#: 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-components.js:44778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "{0} 文字削除してください" -#: 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-components.js:44780 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "{0} 文字削除してください" -#: 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-components.js:44784 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "{0} 件のみ選択できます" -#: 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-components.js:44786 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "{0} 件のみ選択できます" -#: 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/rhodecode-components.js:45724 +#: rhodecode/public/js/scripts.js:37528 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: 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/rhodecode-components.js:45726 +#: rhodecode/public/js/scripts.js:37530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: 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/rhodecode-components.js:46172 +#: rhodecode/public/js/scripts.js:37976 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "ステータスを承認にする" -#: 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/rhodecode-components.js:46191 +#: rhodecode/public/js/scripts.js:37995 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "ステータスを拒否にする" -#: 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/rhodecode-components.js:46210 +#: rhodecode/public/js/scripts.js:38014 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:44673 -#: rhodecode/public/js/scripts.js:36521 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:46230 +#: rhodecode/public/js/scripts.js:38034 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: 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/rhodecode-components.js:46597 +#: rhodecode/public/js/scripts.js:38401 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: 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/rhodecode-components.js:46681 +#: rhodecode/public/js/scripts.js:38485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "ステータスレビュー" -#: 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/rhodecode-components.js:46696 +#: rhodecode/public/js/scripts.js:38500 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: 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:45296 -#: rhodecode/public/js/scripts.js:37144 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:46853 +#: rhodecode/public/js/scripts.js:38657 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "送信中..." -#: 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/rhodecode-components.js:46904 +#: rhodecode/public/js/scripts.js:38708 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: 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:45452 -#: rhodecode/public/js/scripts.js:37300 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:538 +#: rhodecode/public/js/rhodecode-components.js:47014 +#: rhodecode/public/js/scripts.js:38818 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/comments.js:543 msgid "Delete this comment?" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47084 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:613 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47161 +#: rhodecode/public/js/scripts.js:38965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode/comments.js:690 msgid "Leave a comment on line {0}." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47275 +#: rhodecode/public/js/scripts.js:39079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/comments.js:804 msgid "TODO from comment {0} was fixed." msgstr "" -#: 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/rhodecode-components.js:47455 +#: rhodecode/public/js/scripts.js:39259 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "省略された結果" -#: 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/rhodecode-components.js:47457 +#: rhodecode/public/js/scripts.js:39261 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "省略された結果" -#: 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/rhodecode-components.js:47466 +#: rhodecode/public/js/scripts.js:39270 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "マッチするファイルはありません" -#: 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/rhodecode-components.js:47601 +#: rhodecode/public/js/scripts.js:39405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "セレクション・リンク" -#: 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/rhodecode-components.js:47641 +#: rhodecode/public/js/scripts.js:39445 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" -#: 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/rhodecode-components.js:47642 +#: rhodecode/public/js/scripts.js:39446 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "アンフォロー" -#: 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/rhodecode-components.js:47651 +#: rhodecode/public/js/scripts.js:39455 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "このリポジトリのフォローする" -#: 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/rhodecode-components.js:47652 +#: rhodecode/public/js/scripts.js:39456 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "フォロー" -#: 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/rhodecode-components.js:48032 +#: rhodecode/public/js/scripts.js:39836 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: 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:46510 -#: rhodecode/public/js/scripts.js:38358 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:48041 +#: rhodecode/public/js/scripts.js:39845 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48046 +#: rhodecode/public/js/scripts.js:39850 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: 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/rhodecode-components.js:48052 +#: rhodecode/public/js/scripts.js:39856 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48068 +#: rhodecode/public/js/scripts.js:39872 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46530 -#: rhodecode/public/js/scripts.js:38378 +#: rhodecode/public/js/rhodecode-components.js:48075 +#: rhodecode/public/js/scripts.js:39879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48082 +#: rhodecode/public/js/scripts.js:39886 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48096 +#: rhodecode/public/js/scripts.js:39900 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48198 +#: rhodecode/public/js/scripts.js:40002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:300 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46823 -#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode-components.js:48204 +#: rhodecode/public/js/scripts.js:40008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +msgid "User `{0}` already in reviewers" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48334 +#: rhodecode/public/js/scripts.js:40138 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:436 msgid "added manually by \"{0}\"" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48338 +#: rhodecode/public/js/scripts.js:40142 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:440 msgid "member of \"{0}\"" msgstr "" -#: 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/rhodecode-components.js:48924 +#: rhodecode/public/js/scripts.js:40728 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "ファイル" -#: 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/rhodecode-components.js:48944 +#: rhodecode/public/js/scripts.js:40748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: 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 +#: rhodecode/public/js/rhodecode-components.js:49356 +#: rhodecode/public/js/scripts.js:41160 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode.js:574 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 +#: rhodecode/public/js/rhodecode-components.js:49364 +#: rhodecode/public/js/scripts.js:41168 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/src/rhodecode.js:582 msgid "Specified expiration date" msgstr "" @@ -4601,174 +4606,180 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:488 -#: rhodecode/templates/codeblocks/diffs.mako:493 +#: rhodecode/templates/codeblocks/diffs.mako:494 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Add another comment" msgstr "別のコメントを追加" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 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/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "No bookmarks available yet." msgstr "まだブックマークがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No branches available yet." msgstr "まだブランチがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No forks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No gists available yet." msgstr "まだ Gist がありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No pull requests available yet." msgstr "まだプルリクエストがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No repositories available yet." msgstr "まだリポジトリがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No repository groups available yet." msgstr "まだリポジトリグループがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 msgid "No ssh keys available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 msgid "No tags available yet." msgstr "まだタグがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 msgid "No user groups available yet." msgstr "まだユーザーグループがありません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No users available yet." msgstr "まだユーザーがいません。" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/templates/changelog/changelog.mako:59 msgid "Open new pull request" msgstr "新しいプルリクエストを作成" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "Open new pull request for selected commit" msgstr "選択したコミットから新しいプルリクエストを作成" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: 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:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "無効" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "有効" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "files" msgstr "ファイル" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "読み込み中..." -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 msgid "{0} out of {1} ssh keys" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 msgid "{0} years" msgstr "" @@ -4842,12 +4853,17 @@ msgstr "管理者権限をもっているため編集できます" msgid "Edit Repository Group" msgstr "リポジトリグループを編集" -#: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:68 +msgid "No repositories or repositories groups exists here." +msgstr "" + +#: rhodecode/templates/index_base.mako:86 +#: rhodecode/templates/index_base.mako:116 #: rhodecode/templates/admin/gists/index.mako:112 #: 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_user_group_membership.mako:39 #: 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 @@ -4864,13 +4880,14 @@ msgstr "リポジトリグループを編集" msgid "Name" msgstr "名前" -#: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/index_base.mako:89 +#: rhodecode/templates/index_base.mako:119 #: 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/my_account/my_account_user_group_membership.mako:44 #: 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:55 @@ -4900,20 +4917,21 @@ msgstr "名前" #: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 -#: rhodecode/templates/summary/components.mako:82 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "説明" -#: rhodecode/templates/index_base.mako:103 -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:92 +#: rhodecode/templates/index_base.mako:122 #: 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/index_base.mako:94 +#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 @@ -4925,11 +4943,11 @@ msgstr "最後の変更点" #: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:68 -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:209 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.mako:134 +#: rhodecode/templates/index_base.mako:125 #: 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 @@ -4941,7 +4959,7 @@ msgstr "所有者" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4958,7 +4976,7 @@ msgid "Home" msgstr "ホーム" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:343 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "サインイン" @@ -4982,7 +5000,7 @@ msgstr "" #: rhodecode/templates/login.mako:68 #: rhodecode/templates/password_reset.mako:37 -#: rhodecode/templates/base/base.mako:46 +#: rhodecode/templates/base/base.mako:48 #: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "サポート" @@ -5137,7 +5155,7 @@ msgid "Repository" msgstr "リポジトリ" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:77 msgid "Admin audit logs" msgstr "" @@ -5324,7 +5342,7 @@ 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/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 @@ -5398,7 +5416,7 @@ msgstr "" #: 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:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5501,8 +5519,8 @@ msgstr "リポジトリグループ" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: 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:249 +#: rhodecode/templates/base/base.mako:86 +#: rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "設定" @@ -5605,7 +5623,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:355 +#: rhodecode/templates/base/base.mako:357 msgid "My account" msgstr "アカウント" @@ -5633,35 +5651,40 @@ msgstr "" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:36 -msgid "OAuth Identities" +#: rhodecode/templates/admin/my_account/my_account.mako:33 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 +msgid "User Group Membership" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:38 +msgid "OAuth Identities" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "メールアドレス" -#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "Watched" msgstr "ウォッチ中" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:43 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 -#: rhodecode/templates/base/base.mako:239 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "プルリクエスト" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:44 #: 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 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:82 msgid "Permissions" msgstr "権限設定" -#: rhodecode/templates/admin/my_account/my_account.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:45 msgid "Live Notifications" msgstr "" @@ -5887,6 +5910,23 @@ msgid "" "sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +msgid "Click add to use this generate SSH key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 +#: 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: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 +#: rhodecode/templates/admin/users/users.mako:74 +msgid "Active" +msgstr "アクティブ" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" @@ -6100,8 +6140,8 @@ msgstr "リポジトリグループを追加" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:77 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:153 msgid "Repository groups" msgstr "リポジトリグループ" @@ -6290,7 +6330,7 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:196 +#: rhodecode/templates/base/base.mako:198 msgid "Clone from" msgstr "クローン元" @@ -6370,7 +6410,7 @@ msgid "Remote" msgstr "リモート" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:143 +#: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "統計" @@ -6395,100 +6435,104 @@ msgstr "" msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Attached scoped tokens" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:25 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 msgid "Set" msgstr "保存" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40 msgid "Manually set this repository as a fork of another from the list" msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:49 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 msgid "" "All actions made on this repository will be visible to everyone following " "the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "リポジトリのロックを解除" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "" "Force repository locking. This only works when anonymous access is disabled." " Pulling from the repository locks the repository to that user until the " "same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "フォークの切り離し" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "フォークも削除" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 #: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "このリポジトリを削除してもよろしいですか？ : %s" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 msgid "" "This repository will be renamed in a special way in order to make it " "inaccessible to RhodeCode Enterprise and its VCS systems. If you need to " @@ -6496,11 +6540,11 @@ msgid "" "rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" @@ -6548,17 +6592,6 @@ msgstr "プレフィックス" msgid "Key" 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: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 -#: rhodecode/templates/admin/users/users.mako:74 -msgid "Active" -msgstr "アクティブ" - #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" @@ -6720,8 +6753,8 @@ msgid "Settings for Repository: %s" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 -msgid "Non-changeable id" -msgstr "変更不能ID" +msgid "permalink id" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" @@ -6915,7 +6948,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:210 +#: rhodecode/templates/admin/settings/settings_visual.mako:214 msgid "Save settings" msgstr "設定を保存" @@ -7209,6 +7242,14 @@ msgstr "更新を確認中..." msgid "Gunicorn process management" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:11 +msgid "start auto refresh" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:12 +msgid "stop auto refresh" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -7259,13 +7300,6 @@ msgstr "" msgid "Cleanup sessions" msgstr "" -#: rhodecode/templates/admin/settings/settings_supervisor_tail.mako:1 -#, python-format -msgid "" -"Last %(size)s bytes of process logs, use ?offset=[num] GET param to set " -"custom size" -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7421,24 +7455,26 @@ msgid "" msgstr "コメントやプルリクエストなどの説明を表示するデフォルトのレンダラーを指定します。変更しても既存のエントリーは正しく表示されます。" #: rhodecode/templates/admin/settings/settings_visual.mako:170 -msgid "Clone URL" -msgstr "クローン URL" +msgid "Clone URL templates" +msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:179 +#: rhodecode/templates/admin/settings/settings_visual.mako:181 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" " {user} current user username,\n" +" {sys_user} current system user running this process, usefull for ssh,\n" +" {hostname} hostname of this server running RhodeCode,\n" " {netloc} network location/server host of running RhodeCode server,\n" " {repo} full repository name,\n" " {repoid} ID of repository, can be used to contruct clone-by-id" -msgstr "クローン URL 生成スキーマ、例: '{scheme}://{user}@{netloc}/{repo}' 次の変数が使えます:\n{scheme} 稼働中の RhodeCode のスキーム 'http' または 'https'\n{user} 現在のユーザー名\n{netloc} 稼働中の RhodeCode のネットワークの場所またはサーバーホスト名\n{repo} リポジトリの完全な名前\n{repoid} リポジトリの ID、ID によるクローンで使用します" +msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:192 +#: rhodecode/templates/admin/settings/settings_visual.mako:196 msgid "Custom Support Link" msgstr "カスタムサポートリンク" -#: rhodecode/templates/admin/settings/settings_visual.mako:200 +#: rhodecode/templates/admin/settings/settings_visual.mako:204 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7453,8 +7489,8 @@ msgstr "ユーザーグループを追加" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:79 -#: rhodecode/templates/base/base.mako:154 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:156 msgid "User groups" msgstr "ユーザーグループ" @@ -7602,7 +7638,7 @@ msgstr "ユーザーを追加" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:80 msgid "Users" msgstr "ユーザー" @@ -7866,13 +7902,17 @@ msgstr "" msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:25 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" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 +msgid "Use this generated key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +msgid "Confirmation required on the next screen" msgstr "" #: rhodecode/templates/admin/users/users.mako:5 @@ -7883,174 +7923,174 @@ msgstr "ユーザー管理" msgid "Auth type" msgstr "認証タイプ" -#: rhodecode/templates/base/base.mako:53 +#: rhodecode/templates/base/base.mako:55 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:83 msgid "Authentication" msgstr "認証" -#: rhodecode/templates/base/base.mako:83 +#: rhodecode/templates/base/base.mako:85 msgid "Defaults" msgstr "デフォルト設定" -#: rhodecode/templates/base/base.mako:101 +#: rhodecode/templates/base/base.mako:103 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:188 +#: rhodecode/templates/base/base.mako:190 msgid "Fork of" msgstr "フォーク元" -#: rhodecode/templates/base/base.mako:205 +#: rhodecode/templates/base/base.mako:207 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:210 +#: rhodecode/templates/base/base.mako:212 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:228 +#: rhodecode/templates/base/base.mako:230 #: 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/base/base.mako:231 #: 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/base/base.mako:232 #: 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:231 +#: rhodecode/templates/base/base.mako:233 #: 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:235 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "%s のプルリクエストを表示" -#: rhodecode/templates/base/base.mako:245 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "オプション" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: 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/base/base.mako:269 +#: rhodecode/templates/base/base.mako:413 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "検索" -#: rhodecode/templates/base/base.mako:271 +#: rhodecode/templates/base/base.mako:273 msgid "Unlock" msgstr "アンロック" -#: rhodecode/templates/base/base.mako:273 +#: rhodecode/templates/base/base.mako:275 msgid "Lock" msgstr "ロック" -#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/base/base.mako:280 #: rhodecode/templates/data_table/_dt_elements.mako:61 #: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "フォーク" -#: rhodecode/templates/base/base.mako:279 +#: rhodecode/templates/base/base.mako:281 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:303 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:309 +#: rhodecode/templates/base/base.mako:311 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/base/base.mako:328 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:336 +#: rhodecode/templates/base/base.mako:338 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:338 +#: rhodecode/templates/base/base.mako:340 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:357 +#: rhodecode/templates/base/base.mako:359 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:361 +#: rhodecode/templates/base/base.mako:363 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:393 +#: rhodecode/templates/base/base.mako:395 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:396 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:15 msgid "Journal" msgstr "ジャーナル" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:401 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:402 msgid "Public journal" msgstr "公開ジャーナル" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:407 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:408 msgid "Gists" msgstr "Gists" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:412 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/base/base.mako:418 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:433 -#: rhodecode/templates/base/base.mako:434 +#: rhodecode/templates/base/base.mako:435 +#: rhodecode/templates/base/base.mako:436 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8072,15 +8112,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:491 +#: rhodecode/templates/base/base.mako:493 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:546 msgid "Keyboard shortcuts" msgstr "キーボードショートカット" -#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:554 msgid "Site-wide shortcuts" msgstr "サイト全体" @@ -8187,8 +8227,8 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:274 -#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:325 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8533,10 +8573,10 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changelog/changelog_elements.mako:121 #: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 -#: rhodecode/templates/summary/summary_commits.mako:62 +#: rhodecode/templates/summary/summary_commits.mako:68 #, python-format msgid "Bookmark %s" msgstr "ブックマーク %s" @@ -8555,10 +8595,10 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changelog/changelog_elements.mako:113 #: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 -#: rhodecode/templates/summary/summary_commits.mako:76 +#: rhodecode/templates/summary/summary_commits.mako:82 #, python-format msgid "Branch %s" msgstr "ブランチ %s" @@ -8623,79 +8663,79 @@ msgstr "まだ変更がありません" msgid "load previous" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/summary/summary_commits.mako:21 +#: rhodecode/templates/changelog/changelog_elements.mako:32 +#: rhodecode/templates/summary/summary_commits.mako:27 #, python-format msgid "" "Commit status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/summary/summary_commits.mako:25 +#: rhodecode/templates/changelog/changelog_elements.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: {}" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/summary/summary_commits.mako:31 +#: rhodecode/templates/changelog/changelog_elements.mako:42 +#: rhodecode/templates/summary/summary_commits.mako:37 msgid "Commit status: Not Reviewed" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/summary/summary_commits.mako:36 +#: rhodecode/templates/changelog/changelog_elements.mako:47 +#: rhodecode/templates/summary/summary_commits.mako:42 msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changelog/changelog_elements.mako:58 #: rhodecode/templates/changeset/changeset.mako:42 msgid "Copy the full commit id" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changelog/changelog_elements.mako:65 #: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:72 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: rhodecode/templates/changeset/changeset.mako:50 #: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:72 #: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: 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/changelog/changelog_elements.mako:83 +#: rhodecode/templates/compare/compare_commits.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "コミットメッセージを展開" -#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changelog/changelog_elements.mako:107 #: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "マージ" -#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 -#: rhodecode/templates/summary/summary_commits.mako:69 +#: rhodecode/templates/summary/summary_commits.mako:75 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "タグ %s" -#: rhodecode/templates/changelog/changelog_elements.mako:137 +#: rhodecode/templates/changelog/changelog_elements.mako:143 msgid "load next" msgstr "" @@ -8730,7 +8770,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:81 +#: rhodecode/templates/changeset/changeset_file_comment.mako:82 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8746,8 +8786,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:445 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:451 +#: rhodecode/templates/codeblocks/diffs.mako:454 msgid "Raw diff" msgstr "diffとして差分を表示" @@ -8764,8 +8804,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:452 -#: rhodecode/templates/codeblocks/diffs.mako:455 +#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:461 msgid "Download diff" msgstr "差分をダウンロード" @@ -8789,103 +8829,103 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:32 +#: rhodecode/templates/changeset/changeset_file_comment.mako:33 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:39 +#: rhodecode/templates/changeset/changeset_file_comment.mako:40 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:66 -#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:67 +#: rhodecode/templates/changeset/changeset_file_comment.mako:69 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:73 +#: rhodecode/templates/changeset/changeset_file_comment.mako:74 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:88 +#: rhodecode/templates/changeset/changeset_file_comment.mako:89 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 msgid "Pull request author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +#: rhodecode/templates/changeset/changeset_file_comment.mako:98 msgid "author" msgstr "作成者" -#: rhodecode/templates/changeset/changeset_file_comment.mako:105 +#: rhodecode/templates/changeset/changeset_file_comment.mako:106 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:109 -#: rhodecode/templates/changeset/changeset_file_comment.mako:124 +#: rhodecode/templates/changeset/changeset_file_comment.mako:110 +#: rhodecode/templates/changeset/changeset_file_comment.mako:125 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:121 +#: rhodecode/templates/changeset/changeset_file_comment.mako:122 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:151 -#: rhodecode/templates/changeset/changeset_file_comment.mako:154 -msgid "Prev" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:152 #: rhodecode/templates/changeset/changeset_file_comment.mako:155 +msgid "Prev" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:153 +#: rhodecode/templates/changeset/changeset_file_comment.mako:156 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:191 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:193 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:195 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: 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:65 +msgid "You need to be logged in to leave comments." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "今すぐログインする" -#: rhodecode/templates/changeset/changeset_file_comment.mako:348 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "" "Use @username inside this text to send notification to this RhodeCode user" msgstr "テキスト内で @username を使うと、その RhodeCode のユーザーに通知を送信します" -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 +#: rhodecode/templates/changeset/changeset_file_comment.mako:352 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:368 +#: rhodecode/templates/changeset/changeset_file_comment.mako:369 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "クローズ" -#: rhodecode/templates/changeset/changeset_file_comment.mako:398 +#: rhodecode/templates/changeset/changeset_file_comment.mako:399 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8982,71 +9022,71 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:290 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/codeblocks/diffs.mako:356 #: 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 +#: rhodecode/templates/codeblocks/diffs.mako:421 +#: rhodecode/templates/codeblocks/diffs.mako:437 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:417 -#: rhodecode/templates/codeblocks/diffs.mako:424 +#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:430 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:422 -#: rhodecode/templates/codeblocks/diffs.mako:438 +#: rhodecode/templates/codeblocks/diffs.mako:428 +#: rhodecode/templates/codeblocks/diffs.mako:444 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:433 -#: rhodecode/templates/codeblocks/diffs.mako:440 +#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:446 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:643 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:651 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:649 +#: rhodecode/templates/codeblocks/diffs.mako:655 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:650 +#: rhodecode/templates/codeblocks/diffs.mako:656 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:660 +#: rhodecode/templates/codeblocks/diffs.mako:666 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:664 +#: rhodecode/templates/codeblocks/diffs.mako:670 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:668 +#: rhodecode/templates/codeblocks/diffs.mako:674 msgid "Wide Mode Diff" msgstr "" @@ -9063,11 +9103,11 @@ msgid "Compare was calculated based on this shared commit." msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:78 msgid "No commits in this compare" msgstr "" @@ -9638,7 +9678,7 @@ msgid "Close File List" msgstr "" #: rhodecode/templates/files/files_browser.mako:25 -#: rhodecode/templates/summary/summary_commits.mako:103 +#: rhodecode/templates/summary/summary_commits.mako:109 msgid "Add New File" msgstr "新しいファイルを追加" @@ -9914,12 +9954,12 @@ msgid "Pull request reviewers" msgstr "プルリクエストレビュアー" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 msgid "Add reviewer or reviewer group" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:504 +#: rhodecode/templates/pullrequests/pullrequest.mako:508 msgid "Please select source and target" msgstr "" @@ -9927,19 +9967,19 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:364 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:368 +#: rhodecode/templates/pullrequests/pullrequest.mako:371 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:431 +#: rhodecode/templates/pullrequests/pullrequest.mako:435 msgid "Target repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:441 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Select commit reference" msgstr "" @@ -10000,8 +10040,7 @@ msgid "Merge" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:140 -#: rhodecode/templates/summary/components.mako:53 -#: rhodecode/templates/summary/components.mako:69 +#: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" @@ -10081,85 +10120,81 @@ msgid "Pull request versions not available" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 msgid "Save Changes" msgstr "変更を保存" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 -msgid "Mandatory reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 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:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 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:431 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 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:442 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 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:482 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:593 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:596 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 msgid "show them" msgstr "" @@ -10270,74 +10305,59 @@ msgstr "このファイル中にさらに一致があります" msgid "File" msgstr "ファイル" -#: rhodecode/templates/summary/components.mako:49 -msgid "Read-only url" -msgstr "リードオンリー URL" - -#: rhodecode/templates/summary/components.mako:56 -#: rhodecode/templates/summary/components.mako:72 +#: rhodecode/templates/summary/components.mako:71 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:76 +msgid "Copy the clone by ssh url" +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 +#: rhodecode/templates/summary/components.mako:80 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:65 -msgid "Clone url" -msgstr "クローンURL" - -#: rhodecode/templates/summary/components.mako:94 +#: rhodecode/templates/summary/components.mako:100 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:110 +#: rhodecode/templates/summary/components.mako:116 msgid "Number of Repository Forks" msgstr "" -#: rhodecode/templates/summary/components.mako:118 +#: rhodecode/templates/summary/components.mako:124 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:149 +#: rhodecode/templates/summary/components.mako:155 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:153 +#: rhodecode/templates/summary/components.mako:159 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" -#: rhodecode/templates/summary/components.mako:156 +#: rhodecode/templates/summary/components.mako:162 msgid "enable statistics" msgstr "統計を有効にする" -#: rhodecode/templates/summary/components.mako:167 +#: rhodecode/templates/summary/components.mako:173 msgid "Downloads" msgstr "ダウンロード" -#: rhodecode/templates/summary/components.mako:173 +#: rhodecode/templates/summary/components.mako:179 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: rhodecode/templates/summary/components.mako:177 +#: rhodecode/templates/summary/components.mako:183 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: rhodecode/templates/summary/components.mako:180 +#: rhodecode/templates/summary/components.mako:186 msgid "enable downloads" msgstr "ダウンロードを有効にする" @@ -10370,15 +10390,15 @@ msgstr "%s ATOM フィード" msgid "%s RSS feed" msgstr "%s RSS フィード" -#: rhodecode/templates/summary/summary_commits.mako:100 +#: rhodecode/templates/summary/summary_commits.mako:106 msgid "Add or upload files directly via RhodeCode:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:111 +#: rhodecode/templates/summary/summary_commits.mako:117 msgid "Push new repo:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:128 msgid "Existing repository?" msgstr "存在するリポジトリをプッシュ" @@ -10406,8 +10426,3 @@ msgstr "名字" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" msgstr "こんにちは" - -#: rhodecode/tests/lib/test_ext_json.py:163 -msgid "singular" -msgid_plural "plural" -msgstr[0] "" diff --git a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo index 33308f64..82e5e4e2 100644 Binary files a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo and b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo differ diff --git a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po index cec52f6a..414486b9 100644 --- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po @@ -1,5 +1,5 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2017 RhodeCode GmbH +# Copyright (C) 2018 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-11-03 16:42+0100\n" -"PO-Revision-Date: 2017-11-03 15:43+0000\n" +"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"PO-Revision-Date: 2018-01-30 16:33+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Polish (http://www.transifex.com/rhodecode/RhodeCode/language/pl/)\n" "MIME-Version: 1.0\n" @@ -25,32 +25,53 @@ msgstr "" "Language: pl\n" "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/apps/_base/__init__.py:142 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "" + +#: rhodecode/apps/_base/__init__.py:146 +#, python-format +msgid "Error creating repository %s" +msgstr "utworzone repozytorium %s" + +#: rhodecode/apps/_base/__init__.py:219 +#, python-format +msgid "" +"The repository `%(repo_name)s` cannot be loaded in filesystem. Please check " +"if it exist, or is not damaged." +msgstr "" + +#: rhodecode/apps/_base/__init__.py:274 +msgid "Editing user `{}` is disabled." +msgstr "" + +#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "Globalne" -#: rhodecode/apps/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:74 #: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "VCS" -#: rhodecode/apps/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:76 msgid "Visual" msgstr "Wizualne" -#: rhodecode/apps/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:78 msgid "Remap and Rescan" msgstr "" -#: rhodecode/apps/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:80 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "" -#: rhodecode/apps/admin/navigation.py:89 -#: rhodecode/integrations/types/email.py:232 +#: rhodecode/apps/admin/navigation.py:82 +#: rhodecode/integrations/types/email.py:233 #: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 @@ -62,15 +83,15 @@ msgstr "" msgid "Email" msgstr "E-mail" -#: rhodecode/apps/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:84 msgid "Hooks" msgstr "Hooks" -#: rhodecode/apps/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:86 msgid "Full Text Search" msgstr "Wyszukiwanie Pełnotekstowe" -#: rhodecode/apps/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:88 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -84,28 +105,28 @@ msgstr "Wyszukiwanie Pełnotekstowe" #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 #: rhodecode/templates/admin/repos/repo_edit.mako:75 -#: rhodecode/templates/base/base.mako:82 +#: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "Integracje" -#: rhodecode/apps/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:90 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "Informacje o systemie" -#: rhodecode/apps/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:92 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:94 msgid "User Sessions" msgstr "" -#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/apps/admin/navigation.py:96 msgid "Open Source Licenses" msgstr "Licencje Otwarto Źródłowe" -#: rhodecode/apps/admin/navigation.py:109 +#: rhodecode/apps/admin/navigation.py:101 msgid "Labs" msgstr "Laboratorium" @@ -117,13 +138,13 @@ msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:121 +#: rhodecode/apps/admin/views/permissions.py:120 msgid "Application permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:141 #: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:287 +#: rhodecode/apps/admin/views/permissions.py:288 msgid "Error occurred during update of permissions" msgstr "Wystąpił błąd podczas aktualizacji uprawnień" @@ -131,11 +152,11 @@ msgstr "Wystąpił błąd podczas aktualizacji uprawnień" msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:267 +#: rhodecode/apps/admin/views/permissions.py:268 msgid "Global permissions updated successfully" msgstr "Globalne uprawnienia zaktualizowane poprawnie" -#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/apps/admin/views/permissions.py:450 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:208 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -156,20 +177,20 @@ msgstr "Globalne uprawnienia zaktualizowane poprawnie" msgid "Edit" msgstr "Edycja" -#: rhodecode/apps/admin/views/permissions.py:476 +#: rhodecode/apps/admin/views/permissions.py:478 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:479 +#: rhodecode/apps/admin/views/permissions.py:481 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:180 +#: rhodecode/apps/admin/views/repo_groups.py:181 #, python-format msgid "Created repository group %s" msgstr "Utworzono grupę repo %s" -#: rhodecode/apps/admin/views/repo_groups.py:198 +#: rhodecode/apps/admin/views/repo_groups.py:199 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" @@ -178,10 +199,86 @@ msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/apps/admin/views/sessions.py:98 +#: rhodecode/apps/admin/views/sessions.py:97 msgid "Failed to cleanup up old sessions" msgstr "" +#: rhodecode/apps/admin/views/settings.py:162 +#: rhodecode/apps/admin/views/settings.py:708 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:351 +msgid "Error occurred during updating application settings" +msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" + +#: rhodecode/apps/admin/views/settings.py:194 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +msgid "Updated VCS settings" +msgstr "Aktualizacja ustawień VCS" + +#: rhodecode/apps/admin/views/settings.py:268 +#, python-format +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, usunięto: %s" + +#: rhodecode/apps/admin/views/settings.py:347 +msgid "Updated application settings" +msgstr "Aktualizacja ustawień aplikacji" + +#: rhodecode/apps/admin/views/settings.py:426 +msgid "Updated visualisation settings" +msgstr "Aktualizacja ustawień wizualizacji" + +#: rhodecode/apps/admin/views/settings.py:429 +msgid "Error occurred during updating visualisation settings" +msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" + +#: rhodecode/apps/admin/views/settings.py:491 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +msgid "Invalid issue tracker pattern: {}" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:508 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:526 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:563 +msgid "Please enter email address" +msgstr "Proszę podać adres email" + +#: rhodecode/apps/admin/views/settings.py:581 +msgid "Send email task created" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:631 +msgid "Added new hook" +msgstr "Dodano nowy hook" + +#: rhodecode/apps/admin/views/settings.py:646 +msgid "Updated hooks" +msgstr "Aktualizacja hooku" + +#: rhodecode/apps/admin/views/settings.py:650 +msgid "Error occurred during hook creation" +msgstr "Wystąpił błąd podczas tworzenia hooku" + +#: rhodecode/apps/admin/views/settings.py:732 +msgid "Error occurred during updating labs settings" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:737 +msgid "Updated Labs settings" +msgstr "" + #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" @@ -190,149 +287,153 @@ msgstr "" msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/apps/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:79 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:102 +#: rhodecode/apps/admin/views/system_info.py:90 msgid "Update info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:104 +#: rhodecode/apps/admin/views/system_info.py:92 msgid "Check for updates" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:97 msgid "RhodeCode Version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:110 +#: rhodecode/apps/admin/views/system_info.py:98 +msgid "Latest version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:99 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:111 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:112 +#: rhodecode/apps/admin/views/system_info.py:101 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "RhodeCode Certificate" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:103 msgid "Workers" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:115 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Worker Type" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "Database" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:109 msgid "Database version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:124 +#: rhodecode/apps/admin/views/system_info.py:113 msgid "Platform" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Platform UUID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Python version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:116 msgid "Python path" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:131 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "CPU" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Load" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Memory" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:123 msgid "Uptime" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Storage inodes" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "Gist storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Gist storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Archive cache storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:148 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Temp storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:149 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Temp storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Search info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Search location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:156 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "VCS Backends" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:157 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "VCS Server" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:158 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "GIT" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:159 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "HG" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:160 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "SVN" msgstr "" @@ -346,188 +447,188 @@ msgstr "" 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 +#: rhodecode/apps/admin/views/users.py:209 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/apps/admin/views/users.py:229 +#: rhodecode/apps/admin/views/users.py:230 #, 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 +#: rhodecode/apps/admin/views/users.py:304 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 +#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/my_account/views/my_account.py:490 #, 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 +#: rhodecode/apps/admin/views/users.py:354 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:358 +#: rhodecode/apps/admin/views/users.py:359 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:366 +#: rhodecode/apps/admin/views/users.py:367 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:371 +#: rhodecode/apps/admin/views/users.py:372 #, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:379 +#: rhodecode/apps/admin/views/users.py:380 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:384 +#: rhodecode/apps/admin/views/users.py:385 #, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:401 +#: rhodecode/apps/admin/views/users.py:402 msgid "Successfully deleted user" msgstr "Użytkownik został usunięty" -#: rhodecode/apps/admin/views/users.py:407 +#: rhodecode/apps/admin/views/users.py:408 msgid "An error occurred during deletion of user" msgstr "Wystąpił błąd podczas usuwania użytkownika" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:473 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 +#: rhodecode/apps/admin/views/users.py:479 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 +#: rhodecode/apps/admin/views/users.py:567 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:583 -#: rhodecode/apps/user_group/views/__init__.py:472 +#: rhodecode/apps/admin/views/users.py:585 +#: rhodecode/apps/user_group/views/__init__.py:448 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" -#: rhodecode/apps/admin/views/users.py:608 +#: rhodecode/apps/admin/views/users.py:610 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:613 +#: rhodecode/apps/admin/views/users.py:615 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:622 +#: rhodecode/apps/admin/views/users.py:624 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:661 +#: rhodecode/apps/admin/views/users.py:663 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:667 +#: rhodecode/apps/admin/views/users.py:669 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/apps/admin/views/users.py:671 +#: rhodecode/apps/admin/views/users.py:673 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:676 +#: rhodecode/apps/admin/views/users.py:678 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/apps/admin/views/users.py:701 +#: rhodecode/apps/my_account/views/my_account.py:160 #: 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:737 -#: rhodecode/apps/my_account/views/my_account.py:193 +#: rhodecode/apps/admin/views/users.py:739 +#: rhodecode/apps/my_account/views/my_account.py:194 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:766 -#: rhodecode/apps/my_account/views/my_account.py:217 +#: rhodecode/apps/admin/views/users.py:768 +#: rhodecode/apps/my_account/views/my_account.py:218 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/admin/views/users.py:840 #: 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/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:849 #: 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/admin/views/users.py:883 #: 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 +#: rhodecode/apps/admin/views/users.py:929 +#: rhodecode/apps/my_account/views/my_account.py:260 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:928 +#: rhodecode/apps/admin/views/users.py:935 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 +#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/my_account/views/my_account.py:266 msgid "An error occurred during email saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: rhodecode/apps/admin/views/users.py:959 +#: rhodecode/apps/admin/views/users.py:966 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1005 +#: rhodecode/apps/admin/views/users.py:1012 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1023 +#: rhodecode/apps/admin/views/users.py:1034 msgid "An error occurred during ip saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: rhodecode/apps/admin/views/users.py:1027 +#: rhodecode/apps/admin/views/users.py:1038 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1057 +#: rhodecode/apps/admin/views/users.py:1068 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:1122 +#: rhodecode/apps/admin/views/users.py:1133 msgid "Groups successfully changed" msgstr "" @@ -552,10 +653,10 @@ 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 +#: rhodecode/public/js/rhodecode-components.js:49320 +#: rhodecode/public/js/scripts.js:41124 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/src/rhodecode.js:538 msgid "Lifetime" msgstr "Czas życia" @@ -606,75 +707,75 @@ msgstr "" 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/apps/home/views.py:218 rhodecode/apps/home/views.py:251 +#: rhodecode/apps/repository/views/repo_pull_requests.py:719 +#: rhodecode/templates/admin/my_account/my_account.mako:41 #: 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:580 +#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:150 +#: rhodecode/templates/base/base.mako:582 msgid "Repositories" msgstr "Repozytoria" -#: rhodecode/apps/home/views.py:241 +#: rhodecode/apps/home/views.py:244 msgid "Groups" msgstr "Grupy" -#: rhodecode/apps/home/views.py:261 +#: rhodecode/apps/home/views.py:264 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "Dziennik publiczny" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 msgid "journal" msgstr "dziennik" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:281 +#: rhodecode/apps/login/views.py:288 msgid "You have successfully registered with RhodeCode" msgstr "" -#: rhodecode/apps/login/views.py:317 +#: rhodecode/apps/login/views.py:325 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:323 +#: rhodecode/apps/login/views.py:331 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:412 +#: rhodecode/apps/login/views.py:420 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:428 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:134 +#: rhodecode/apps/my_account/views/my_account.py:135 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:141 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:288 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:465 +#: rhodecode/apps/my_account/views/my_account.py:470 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" @@ -689,7 +790,7 @@ 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 +#: rhodecode/apps/user_group/views/__init__.py:328 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -716,28 +817,28 @@ msgstr "Wystąpił błąd podczas unieważniania cache" #: 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:585 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_commits.py:192 #: 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 +#: rhodecode/apps/repository/views/repo_checks.py:98 #, python-format msgid "Created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: rhodecode/apps/repository/views/repo_checks.py:104 +#: rhodecode/apps/repository/views/repo_checks.py:107 #, python-format msgid "Forked repository %s as %s" msgstr "Gałęzi %s w repozytorium %s" -#: rhodecode/apps/repository/views/repo_checks.py:107 +#: rhodecode/apps/repository/views/repo_checks.py:110 #, python-format msgid "Created repository %s" msgstr "Utworzone repozytorium %s" @@ -766,13 +867,13 @@ msgstr "" msgid "Increase context for all diffs" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:389 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#: rhodecode/apps/repository/views/repo_commits.py:388 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1129 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:433 +#: rhodecode/apps/repository/views/repo_commits.py:432 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -854,14 +955,14 @@ 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/apps/repository/views/repo_summary.py:322 +#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 #: 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 +#: rhodecode/model/scm.py:804 rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "Etykiety" @@ -922,12 +1023,12 @@ msgid "" "the path" msgstr "" -#: rhodecode/apps/repository/views/repo_forks.py:144 -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "Porównaj rozwidlenie" -#: rhodecode/apps/repository/views/repo_forks.py:250 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" @@ -936,91 +1037,88 @@ msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" msgid "Repository permissions updated" msgstr "Uprawnienia repozytorium zostały zaktualizowane" -#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +#: rhodecode/apps/repository/views/repo_pull_requests.py:615 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:750 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +#: rhodecode/apps/repository/views/repo_pull_requests.py:775 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +#: rhodecode/apps/repository/views/repo_pull_requests.py:790 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +#: rhodecode/apps/repository/views/repo_pull_requests.py:841 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:844 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +#: rhodecode/apps/repository/views/repo_pull_requests.py:875 +#: rhodecode/apps/repository/views/repo_pull_requests.py:905 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +#: rhodecode/apps/repository/views/repo_pull_requests.py:911 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:946 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1010 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1034 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1060 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 +#: rhodecode/apps/repository/views/repo_settings.py:168 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:193 +#: rhodecode/apps/repository/views/repo_settings.py:194 msgid "Unlocked" msgstr "Odblokowany" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:199 msgid "Locked" msgstr "Zablokowany" -#: rhodecode/apps/repository/views/repo_settings.py:200 +#: rhodecode/apps/repository/views/repo_settings.py:201 #, 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.py:205 #: 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 +#: rhodecode/apps/repository/views/repo_settings.py:249 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" @@ -1083,28 +1181,18 @@ msgstr "Zablokowane repozytorium" msgid "Unlocked repository" msgstr "Odblokowane repozytorium" -#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +#: rhodecode/apps/repository/views/repo_settings_fields.py:86 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 +#: rhodecode/apps/repository/views/repo_settings_fields.py:108 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 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86 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" @@ -1113,34 +1201,23 @@ msgstr "Pobieranie z lokalizacji zdalnej" 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 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Branch" msgstr "gałąź" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Tag" msgstr "Tag" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:299 msgid "Bookmark" msgstr "Bookmark" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:323 msgid "Closed branches" msgstr "Zamkniętę gałęzie" @@ -1152,41 +1229,41 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:209 +#: rhodecode/apps/user_group/views/__init__.py:184 #, python-format msgid "Updated user group %s" msgstr "Zaktualizowano grupę użytkowników %s" -#: rhodecode/apps/user_group/views/__init__.py:231 +#: rhodecode/apps/user_group/views/__init__.py:206 #, 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 +#: rhodecode/apps/user_group/views/__init__.py:232 msgid "Successfully deleted user group" msgstr "Grupa użytkowników została usunięta z powodzeniem" -#: rhodecode/apps/user_group/views/__init__.py:262 +#: rhodecode/apps/user_group/views/__init__.py:237 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 +#: rhodecode/apps/user_group/views/__init__.py:341 msgid "Target group cannot be the same" msgstr "Grupa docelowa nie może być taka sama" -#: rhodecode/apps/user_group/views/__init__.py:381 +#: rhodecode/apps/user_group/views/__init__.py:356 msgid "User Group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" -#: rhodecode/apps/user_group/views/__init__.py:452 +#: rhodecode/apps/user_group/views/__init__.py:428 msgid "User Group global permissions updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:534 +#: rhodecode/apps/user_group/views/__init__.py:510 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:538 +#: rhodecode/apps/user_group/views/__init__.py:514 msgid "An error occurred during synchronization update" msgstr "" @@ -1213,20 +1290,20 @@ msgstr "" msgid "Auth Cache TTL" msgstr "" -#: rhodecode/authentication/views.py:90 +#: rhodecode/authentication/views.py:93 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:170 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:181 +#: rhodecode/authentication/views.py:173 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:191 +#: rhodecode/authentication/views.py:181 msgid "Error occurred during update of auth settings." msgstr "" @@ -1351,11 +1428,11 @@ msgid "Password to authenticate for given user DN." msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 -#: rhodecode/integrations/types/webhook.py:214 +#: rhodecode/integrations/types/webhook.py:220 #: 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:324 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Hasło" @@ -1479,56 +1556,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:286 -msgid "Error occurred during updating application settings" -msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" - -#: rhodecode/controllers/admin/settings.py:226 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, usunięto: %s" - -#: rhodecode/controllers/admin/settings.py:282 -msgid "Updated application settings" -msgstr "Aktualizacja ustawień aplikacji" - -#: rhodecode/controllers/admin/settings.py:348 -msgid "Updated visualisation settings" -msgstr "Aktualizacja ustawień wizualizacji" - -#: rhodecode/controllers/admin/settings.py:351 -msgid "Error occurred during updating visualisation settings" -msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" - -#: rhodecode/controllers/admin/settings.py:444 -msgid "Please enter email address" -msgstr "Proszę podać adres email" - -#: rhodecode/controllers/admin/settings.py:462 -msgid "Send email task created" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:495 -msgid "Added new hook" -msgstr "Dodano nowy hook" - -#: rhodecode/controllers/admin/settings.py:510 -msgid "Updated hooks" -msgstr "Aktualizacja hooku" - -#: rhodecode/controllers/admin/settings.py:514 -msgid "Error occurred during hook creation" -msgstr "Wystąpił błąd podczas tworzenia hooku" - -#: rhodecode/controllers/admin/settings.py:643 -msgid "Error occurred during updating labs settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:648 -msgid "Updated Labs settings" -msgstr "" - #: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" @@ -1553,35 +1580,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:149 +#: rhodecode/events/repo.py:189 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:158 +#: rhodecode/events/repo.py:198 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:167 +#: rhodecode/events/repo.py:207 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:176 +#: rhodecode/events/repo.py:216 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:256 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:265 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:274 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:285 msgid "repository push" msgstr "" @@ -1632,7 +1659,7 @@ msgstr "" #: 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:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:215 #: 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 @@ -1660,9 +1687,9 @@ msgstr "Zresetuj" #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: 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/changeset/changeset_file_comment.mako:143 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:148 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1725,81 +1752,81 @@ msgstr "" msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:302 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:327 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:214 +#: rhodecode/integrations/types/email.py:215 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:215 +#: rhodecode/integrations/types/email.py:216 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:220 #: rhodecode/integrations/types/email.py:221 +#: rhodecode/integrations/types/email.py:222 msgid "Email address" msgstr "Adres e-mail" -#: rhodecode/integrations/types/email.py:233 +#: rhodecode/integrations/types/email.py:234 msgid "Send repo push summaries to a list of recipients via email" msgstr "" -#: rhodecode/integrations/types/hipchat.py:43 +#: rhodecode/integrations/types/hipchat.py:41 msgid "Yellow" msgstr "" -#: rhodecode/integrations/types/hipchat.py:44 +#: rhodecode/integrations/types/hipchat.py:42 msgid "Red" msgstr "" -#: rhodecode/integrations/types/hipchat.py:45 +#: rhodecode/integrations/types/hipchat.py:43 msgid "Green" msgstr "" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Purple" msgstr "" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Gray" msgstr "" -#: rhodecode/integrations/types/hipchat.py:52 +#: rhodecode/integrations/types/hipchat.py:50 msgid "Hipchat server URL" msgstr "" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:51 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:63 +#: rhodecode/integrations/types/hipchat.py:61 msgid "Notify" msgstr "" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:62 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:70 +#: rhodecode/integrations/types/hipchat.py:68 msgid "Color" msgstr "" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:69 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:99 +#: rhodecode/integrations/types/hipchat.py:97 msgid "Hipchat" msgstr "" -#: rhodecode/integrations/types/hipchat.py:100 +#: rhodecode/integrations/types/hipchat.py:98 msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" @@ -1815,7 +1842,7 @@ msgid "" msgstr "" #: rhodecode/integrations/types/slack.py:60 -#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/integrations/types/webhook.py:210 #: 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 @@ -1826,7 +1853,7 @@ msgstr "" #: 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:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1862,11 +1889,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:177 +#: rhodecode/integrations/types/webhook.py:183 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:185 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 " @@ -1874,53 +1901,53 @@ msgid "" "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:199 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:194 +#: rhodecode/integrations/types/webhook.py:200 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 +#: rhodecode/integrations/types/webhook.py:211 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:215 +#: rhodecode/integrations/types/webhook.py:221 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:225 +#: rhodecode/integrations/types/webhook.py:231 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:226 +#: rhodecode/integrations/types/webhook.py:232 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:235 +#: rhodecode/integrations/types/webhook.py:241 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:236 +#: rhodecode/integrations/types/webhook.py:242 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:245 +#: rhodecode/integrations/types/webhook.py:251 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:246 +#: rhodecode/integrations/types/webhook.py:252 msgid "Select if the Webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:259 +#: rhodecode/integrations/types/webhook.py:265 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:260 +#: rhodecode/integrations/types/webhook.py:266 msgid "Post json events to a Webhook endpoint" msgstr "" @@ -2008,80 +2035,63 @@ msgstr "[start następnego] repozytorium" msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: rhodecode/lib/action_parser.py:171 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "nazwa rozgałęzienia %s" -#: rhodecode/lib/action_parser.py:189 +#: rhodecode/lib/action_parser.py:191 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "Połączonych gałęzi #%s" -#: rhodecode/lib/action_parser.py:223 +#: rhodecode/lib/action_parser.py:226 #, python-format msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:228 +#: rhodecode/lib/action_parser.py:231 msgid "compare view" msgstr "Wyświetl porównanie" -#: rhodecode/lib/action_parser.py:235 +#: rhodecode/lib/action_parser.py:238 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:288 +#: rhodecode/lib/action_parser.py:293 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: rhodecode/lib/action_parser.py:291 +#: rhodecode/lib/action_parser.py:296 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: rhodecode/lib/action_parser.py:304 +#: rhodecode/lib/action_parser.py:309 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1445 +#: rhodecode/lib/auth.py:1441 #, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: rhodecode/lib/auth.py:1535 +#: rhodecode/lib/auth.py:1531 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:1577 +#: rhodecode/lib/auth.py:1575 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:62 -msgid "Click to comment" -msgstr "" - -#: rhodecode/lib/diffs.py:77 -msgid "Binary file" -msgstr "Plik binarny" - -#: rhodecode/lib/diffs.py:98 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby wyświetlić różnice" - -#: rhodecode/lib/diffs.py:109 -msgid "No changes detected" -msgstr "Nie wykryto zmian" - -#: rhodecode/lib/diffs.py:927 +#: rhodecode/lib/diffs.py:864 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1869 +#: rhodecode/lib/helpers.py:1855 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2101,7 +2111,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1893 +#: rhodecode/lib/helpers.py:1879 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2115,49 +2125,49 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1910 +#: rhodecode/lib/helpers.py:1896 #, 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:525 +#: rhodecode/lib/utils2.py:524 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:531 +#: rhodecode/lib/utils2.py:530 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:540 +#: rhodecode/lib/utils2.py:539 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:542 +#: rhodecode/lib/utils2.py:541 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:544 +#: rhodecode/lib/utils2.py:543 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:546 +#: rhodecode/lib/utils2.py:545 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:548 +#: rhodecode/lib/utils2.py:547 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:550 +#: rhodecode/lib/utils2.py:549 msgid "in ${val} and ${detail}" msgstr "" -#: 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/lib/utils2.py:553 +#: rhodecode/public/js/rhodecode-components.js:30702 +#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "przed chwilą" @@ -2185,6 +2195,7 @@ msgstr "przed chwilą" #: 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_11_0_0.py:2599 #: 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 @@ -2193,7 +2204,7 @@ msgstr "przed chwilą" #: 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 +#: rhodecode/model/db.py:2626 msgid "Repository no access" msgstr "Brak dostępu do repozytorium" @@ -2220,6 +2231,7 @@ msgstr "Brak dostępu do repozytorium" #: 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_11_0_0.py:2600 #: 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 @@ -2228,7 +2240,7 @@ msgstr "Brak dostępu do repozytorium" #: 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 +#: rhodecode/model/db.py:2627 msgid "Repository read access" msgstr "Repozytorium do odczytu" @@ -2255,6 +2267,7 @@ msgstr "Repozytorium do odczytu" #: 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_11_0_0.py:2601 #: 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 @@ -2263,7 +2276,7 @@ msgstr "Repozytorium do odczytu" #: 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 +#: rhodecode/model/db.py:2628 msgid "Repository write access" msgstr "Repozytorium do zapisu" @@ -2290,6 +2303,7 @@ msgstr "Repozytorium do zapisu" #: 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_11_0_0.py:2602 #: 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 @@ -2298,7 +2312,7 @@ msgstr "Repozytorium do zapisu" #: 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 +#: rhodecode/model/db.py:2629 msgid "Repository admin access" msgstr "Administracja dostępu do repozytorium" @@ -2365,6 +2379,7 @@ msgstr "Administrator Repo" #: 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_11_0_0.py:2620 #: 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 @@ -2373,7 +2388,7 @@ msgstr "Administrator Repo" #: 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 +#: rhodecode/model/db.py:2647 msgid "Repository creation disabled" msgstr "Tworzenie repozytorium jest wyłączone" @@ -2400,6 +2415,7 @@ msgstr "Tworzenie repozytorium jest wyłączone" #: 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_11_0_0.py:2621 #: 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 @@ -2408,7 +2424,7 @@ msgstr "Tworzenie repozytorium jest wyłączone" #: 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 +#: rhodecode/model/db.py:2648 msgid "Repository creation enabled" msgstr "Tworzenie repozytorium jest włączone" @@ -2435,6 +2451,7 @@ msgstr "Tworzenie repozytorium jest włączone" #: 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_11_0_0.py:2625 #: 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 @@ -2443,7 +2460,7 @@ msgstr "Tworzenie repozytorium jest włączone" #: 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 +#: rhodecode/model/db.py:2652 msgid "Repository forking disabled" msgstr "Rozwidlenie repozytorium wyłączone" @@ -2470,6 +2487,7 @@ msgstr "Rozwidlenie repozytorium wyłączone" #: 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_11_0_0.py:2626 #: 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 @@ -2478,7 +2496,7 @@ msgstr "Rozwidlenie repozytorium wyłączone" #: 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 +#: rhodecode/model/db.py:2653 msgid "Repository forking enabled" msgstr "Rozwidlenie repozytorium włączone" @@ -2526,6 +2544,7 @@ msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" #: 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_11_0_0.py:3328 #: 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 @@ -2534,7 +2553,11 @@ msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" #: 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 +#: rhodecode/model/db.py:3355 +#: rhodecode/public/js/rhodecode-components.js:48211 +#: rhodecode/public/js/scripts.js:40015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "Not Reviewed" msgstr "Brak Korekty" @@ -2561,6 +2584,7 @@ msgstr "Brak Korekty" #: 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_11_0_0.py:3329 #: 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 @@ -2569,7 +2593,7 @@ msgstr "Brak Korekty" #: 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 +#: rhodecode/model/db.py:3356 msgid "Approved" msgstr "Zaakceptowano" @@ -2596,6 +2620,7 @@ msgstr "Zaakceptowano" #: 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_11_0_0.py:3330 #: 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 @@ -2604,7 +2629,7 @@ msgstr "Zaakceptowano" #: 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 +#: rhodecode/model/db.py:3357 msgid "Rejected" msgstr "Odrzucono" @@ -2631,6 +2656,7 @@ msgstr "Odrzucono" #: 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_11_0_0.py:3331 #: 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 @@ -2639,7 +2665,7 @@ msgstr "Odrzucono" #: 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 +#: rhodecode/model/db.py:3358 msgid "Under Review" msgstr "Objęty Przeglądem" @@ -2663,6 +2689,7 @@ msgstr "Objęty Przeglądem" #: 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_11_0_0.py:2604 #: 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 @@ -2671,7 +2698,7 @@ msgstr "Objęty Przeglądem" #: 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 +#: rhodecode/model/db.py:2631 msgid "Repository group no access" msgstr "Grupy repozytoriów brak dostępu" @@ -2695,6 +2722,7 @@ msgstr "Grupy repozytoriów brak dostępu" #: 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_11_0_0.py:2605 #: 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 @@ -2703,7 +2731,7 @@ msgstr "Grupy repozytoriów brak dostępu" #: 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 +#: rhodecode/model/db.py:2632 msgid "Repository group read access" msgstr "Grupy repozytoriów dostęp do odczytu" @@ -2727,6 +2755,7 @@ msgstr "Grupy repozytoriów dostęp do odczytu" #: 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_11_0_0.py:2606 #: 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 @@ -2735,7 +2764,7 @@ msgstr "Grupy repozytoriów dostęp do odczytu" #: 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 +#: rhodecode/model/db.py:2633 msgid "Repository group write access" msgstr "Grupy repozytoriów dostęp do zapisu" @@ -2759,6 +2788,7 @@ msgstr "Grupy repozytoriów dostęp do zapisu" #: 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_11_0_0.py:2607 #: 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 @@ -2767,7 +2797,7 @@ msgstr "Grupy repozytoriów dostęp do zapisu" #: 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 +#: rhodecode/model/db.py:2634 msgid "Repository group admin access" msgstr "Repozytoria Grupy dostęp administratora" @@ -2790,6 +2820,7 @@ msgstr "Repozytoria Grupy dostęp administratora" #: 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_11_0_0.py:2609 #: 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 @@ -2798,7 +2829,7 @@ msgstr "Repozytoria Grupy dostęp administratora" #: 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 +#: rhodecode/model/db.py:2636 msgid "User group no access" msgstr "Ta grupa użytkowników nie ma dostępu" @@ -2821,6 +2852,7 @@ msgstr "Ta grupa użytkowników nie ma dostępu" #: 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_11_0_0.py:2610 #: 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 @@ -2829,7 +2861,7 @@ msgstr "Ta grupa użytkowników nie ma dostępu" #: 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 +#: rhodecode/model/db.py:2637 msgid "User group read access" msgstr "Dostęp do grupy parametrów użytkownika" @@ -2852,6 +2884,7 @@ msgstr "Dostęp do grupy parametrów użytkownika" #: 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_11_0_0.py:2611 #: 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 @@ -2860,7 +2893,7 @@ msgstr "Dostęp do grupy parametrów użytkownika" #: 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 +#: rhodecode/model/db.py:2638 msgid "User group write access" msgstr "Ta grupa użytkowników ma prawo do zapisu" @@ -2883,6 +2916,7 @@ msgstr "Ta grupa użytkowników ma prawo do zapisu" #: 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_11_0_0.py:2612 #: 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 @@ -2891,7 +2925,7 @@ msgstr "Ta grupa użytkowników ma prawo do zapisu" #: 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 +#: rhodecode/model/db.py:2639 msgid "User group admin access" msgstr "Ta grupa użytkowników ma uprawnienia administratora" @@ -2914,6 +2948,7 @@ msgstr "Ta grupa użytkowników ma uprawnienia administratora" #: 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_11_0_0.py:2614 #: 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 @@ -2922,7 +2957,7 @@ msgstr "Ta grupa użytkowników ma uprawnienia administratora" #: 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 +#: rhodecode/model/db.py:2641 msgid "Repository Group creation disabled" msgstr "Tworzenie grup repozytoriów wyłączone" @@ -2945,6 +2980,7 @@ msgstr "Tworzenie grup repozytoriów wyłączone" #: 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_11_0_0.py:2615 #: 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 @@ -2953,7 +2989,7 @@ msgstr "Tworzenie grup repozytoriów wyłączone" #: 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 +#: rhodecode/model/db.py:2642 msgid "Repository Group creation enabled" msgstr "Tworzenie grup repozytoriów włączone" @@ -2976,6 +3012,7 @@ msgstr "Tworzenie grup repozytoriów włączone" #: 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_11_0_0.py:2617 #: 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 @@ -2984,7 +3021,7 @@ msgstr "Tworzenie grup repozytoriów włączone" #: 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 +#: rhodecode/model/db.py:2644 msgid "User Group creation disabled" msgstr "Tworzenie grup użytkowników wyłączone" @@ -3007,6 +3044,7 @@ msgstr "Tworzenie grup użytkowników wyłączone" #: 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_11_0_0.py:2618 #: 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 @@ -3015,7 +3053,7 @@ msgstr "Tworzenie grup użytkowników wyłączone" #: 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 +#: rhodecode/model/db.py:2645 msgid "User Group creation enabled" msgstr "Tworzenie grup użytkowników właczone" @@ -3038,6 +3076,7 @@ msgstr "Tworzenie grup użytkowników właczone" #: 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_11_0_0.py:2628 #: 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 @@ -3046,7 +3085,7 @@ msgstr "Tworzenie grup użytkowników właczone" #: 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 +#: rhodecode/model/db.py:2655 msgid "Registration disabled" msgstr "Rejestracja wyłączona" @@ -3069,6 +3108,7 @@ msgstr "Rejestracja wyłączona" #: 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_11_0_0.py:2629 #: 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 @@ -3077,7 +3117,7 @@ msgstr "Rejestracja wyłączona" #: 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 +#: rhodecode/model/db.py:2656 msgid "User Registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" @@ -3100,6 +3140,7 @@ msgstr "Rejestracja użytkownika z ręczną aktywacją konta" #: 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_11_0_0.py:2630 #: 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 @@ -3108,7 +3149,7 @@ msgstr "Rejestracja użytkownika z ręczną aktywacją konta" #: 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 +#: rhodecode/model/db.py:2657 msgid "User Registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" @@ -3131,6 +3172,7 @@ msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" #: 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_11_0_0.py:2636 #: 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 @@ -3139,7 +3181,7 @@ msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" #: 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 +#: rhodecode/model/db.py:2663 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "Ręczna aktywacja nowego konta" @@ -3162,6 +3204,7 @@ msgstr "Ręczna aktywacja nowego konta" #: 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_11_0_0.py:2637 #: 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 @@ -3170,7 +3213,7 @@ msgstr "Ręczna aktywacja nowego konta" #: 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 +#: rhodecode/model/db.py:2664 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "Automatyczna aktywacja nowego konta" @@ -3187,6 +3230,7 @@ msgstr "Automatyczna aktywacja nowego konta" #: 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_11_0_0.py:2622 #: 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 @@ -3195,7 +3239,7 @@ msgstr "Automatyczna aktywacja nowego konta" #: 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 +#: rhodecode/model/db.py:2649 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3213,6 +3257,7 @@ msgstr "" #: 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_11_0_0.py:2623 #: 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 @@ -3221,7 +3266,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2650 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3236,6 +3281,7 @@ msgstr "" #: 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_11_0_0.py:2597 #: 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 @@ -3244,7 +3290,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2624 msgid "RhodeCode Super Administrator" msgstr "" @@ -3256,6 +3302,7 @@ msgstr "" #: 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_11_0_0.py:2639 #: 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 @@ -3264,7 +3311,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2666 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3276,6 +3323,7 @@ msgstr "" #: 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_11_0_0.py:2640 #: 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 @@ -3284,10 +3332,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2667 msgid "Inherit object permissions from default user enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 #: 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 @@ -3296,10 +3345,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: 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 +#: rhodecode/model/db.py:1107 msgid "all" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3308,10 +3358,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: 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 +#: rhodecode/model/db.py:1108 msgid "http/web interface" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3320,10 +3371,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: 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 +#: rhodecode/model/db.py:1109 msgid "vcs (git/hg/svn protocol)" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3332,10 +3384,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: 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 +#: rhodecode/model/db.py:1110 msgid "api calls" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 #: 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 @@ -3344,10 +3397,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:1111 msgid "feed access" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 #: 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 @@ -3356,60 +3410,51 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2387 msgid "No parent" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 #: 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 +#: rhodecode/model/db.py:2659 msgid "Password reset enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 #: 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 +#: rhodecode/model/db.py:2660 msgid "Password reset hidden" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 #: 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 +#: rhodecode/model/db.py:2661 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:150 -msgid "Invalid search query. Try quoting it." -msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go." - -#: rhodecode/lib/index/whoosh.py:152 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh" - -#: rhodecode/lib/index/whoosh.py:157 -msgid "An error occurred during this search operation" -msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" - -#: rhodecode/lib/index/whoosh.py:165 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:166 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" @@ -3429,28 +3474,28 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:382 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:376 +#: rhodecode/model/comment.py:383 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:87 +#: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "Wpisz login" -#: rhodecode/model/forms.py:88 +#: rhodecode/model/forms.py:89 #, 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:98 +#: rhodecode/model/forms.py:99 msgid "Please enter a password" msgstr "Wpisz hasło" -#: rhodecode/model/forms.py:99 +#: rhodecode/model/forms.py:100 #, python-format msgid "Enter %(min)i characters or more" msgstr "Wpisz %(min)i lub więcej znaków" @@ -3537,8 +3582,8 @@ msgstr "Odczyt" #: 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 -#: rhodecode/templates/changeset/changeset_file_comment.mako:321 +#: rhodecode/templates/changeset/changeset_file_comment.mako:272 +#: rhodecode/templates/changeset/changeset_file_comment.mako:322 msgid "Write" msgstr "Zapis" @@ -3572,8 +3617,8 @@ 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:417 -#: rhodecode/templates/base/base.mako:424 +#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:426 msgid "Admin" msgstr "Administracja" @@ -3690,115 +3735,79 @@ msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1218 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1168 +#: rhodecode/model/pull_request.py:1220 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1181 +#: rhodecode/model/pull_request.py:1233 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1200 +#: rhodecode/model/pull_request.py:1252 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1203 +#: rhodecode/model/pull_request.py:1255 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 +#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 msgid "Bookmarks" msgstr "Zakładki" -#: rhodecode/model/pull_request.py:1370 +#: rhodecode/model/pull_request.py:1425 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1373 +#: rhodecode/model/pull_request.py:1428 msgid "Closed Branches" msgstr "Zamknięte Gałęzie" -#: rhodecode/model/pull_request.py:1533 +#: rhodecode/model/pull_request.py:1588 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1546 +#: rhodecode/model/pull_request.py:1601 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1561 +#: rhodecode/model/pull_request.py:1616 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1564 +#: rhodecode/model/pull_request.py:1619 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1599 +#: rhodecode/model/pull_request.py:1654 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1604 +#: rhodecode/model/pull_request.py:1659 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1611 +#: rhodecode/model/pull_request.py:1666 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1613 +#: rhodecode/model/pull_request.py:1668 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:762 +#: rhodecode/model/scm.py:775 msgid "latest tip" msgstr "ostatni tip" -#: rhodecode/model/user.py:166 -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:333 -#, python-format -msgid "" -"You can't edit this user (`%(username)s`) since it's crucial for entire " -"application" -msgstr "" - -#: 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: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: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:532 -#, python-format -msgid "" -"user \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups:%s" -msgstr "" - -#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99 +#: rhodecode/model/validators.py:92 rhodecode/model/validators.py:93 msgid "Value cannot be an empty list" msgstr "Wartość listy nie może być pusta" -#: rhodecode/model/validators.py:142 +#: rhodecode/model/validators.py:139 msgid "Pattern already exists" msgstr "" @@ -3819,30 +3828,26 @@ msgid "" "dashes and must begin with alphanumeric character or underscore" msgstr "Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i muszą zaczynać się znakiem alfanumerycznym lub podkreśleniem" -#: rhodecode/model/validators.py:192 -msgid "The input is not valid" -msgstr "" - -#: rhodecode/model/validators.py:199 +#: rhodecode/model/validators.py:195 #, python-format msgid "Username %(username)s is not valid" msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" -#: rhodecode/model/validators.py:200 +#: rhodecode/model/validators.py:196 #, python-format msgid "Username %(username)s is disabled" msgstr "" -#: rhodecode/model/validators.py:223 +#: rhodecode/model/validators.py:221 msgid "Invalid user group name" msgstr "Niewłaściwa nazwa grupy" -#: rhodecode/model/validators.py:224 +#: rhodecode/model/validators.py:222 #, python-format msgid "User group `%(usergroup)s` already exists" msgstr "" -#: rhodecode/model/validators.py:226 +#: rhodecode/model/validators.py:224 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -3870,166 +3875,166 @@ msgstr "" msgid "no permission to store repository group in root location" msgstr "" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:387 msgid "Invalid characters (non-ascii) in password" msgstr "Nieprawidłowe znaki (nie-ascii) w haśle" -#: rhodecode/model/validators.py:401 -msgid "Invalid old password" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:406 msgid "Passwords do not match" msgstr "Hasła różnią się" -#: rhodecode/model/validators.py:436 +#: rhodecode/model/validators.py:426 msgid "invalid password" msgstr "nieprawidłowe hasło" -#: rhodecode/model/validators.py:437 +#: rhodecode/model/validators.py:427 msgid "invalid user name" msgstr "niepoprawna nazwa użytkownika" -#: rhodecode/model/validators.py:438 +#: rhodecode/model/validators.py:428 msgid "Your account is disabled" msgstr "Twoje konto jest wyłączone" -#: rhodecode/model/validators.py:470 -msgid "Token mismatch" -msgstr "Niezgodność tokenu" - -#: rhodecode/model/validators.py:484 +#: rhodecode/model/validators.py:464 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Nazwa repozytorium %(repo)s jest zabroniona" -#: rhodecode/model/validators.py:486 +#: rhodecode/model/validators.py:466 #, python-format msgid "Repository with name %(repo)s already exists" msgstr "" -#: rhodecode/model/validators.py:488 +#: rhodecode/model/validators.py:468 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje" -#: rhodecode/model/validators.py:491 +#: rhodecode/model/validators.py:471 #, python-format msgid "Repository with name %(repo)s exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:493 +#: rhodecode/model/validators.py:473 #, python-format msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:566 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219 msgid "Repository name cannot end with .git" msgstr "" -#: rhodecode/model/validators.py:640 +#: rhodecode/model/validators.py:626 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "" -#: rhodecode/model/validators.py:641 +#: rhodecode/model/validators.py:627 #, python-format msgid "" "Invalid clone url, provide a valid clone url starting with one of " "%(allowed_prefixes)s" msgstr "" -#: rhodecode/model/validators.py:670 +#: rhodecode/model/validators.py:659 msgid "Fork have to be the same type as parent" msgstr "Fork musi być tego samego typu, jak rodzic" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:676 msgid "You do not have the permission to create repositories in this group." msgstr "" -#: rhodecode/model/validators.py:688 +#: rhodecode/model/validators.py:679 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "" "You do not have the permission to store repositories in the root location." msgstr "" -#: rhodecode/model/validators.py:748 +#: rhodecode/model/validators.py:739 msgid "This username or user group name is not valid" msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa" -#: rhodecode/model/validators.py:879 +#: rhodecode/model/validators.py:852 msgid "This is not a valid path" msgstr "To nie jest prawidłowa ścieżka" -#: rhodecode/model/validators.py:894 +#: rhodecode/model/validators.py:870 msgid "This e-mail address is already taken" msgstr "Ten adres e-mail jest już zajęty" -#: rhodecode/model/validators.py:914 +#: rhodecode/model/validators.py:892 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "e-mail \"%(email)s\" nie istnieje." -#: rhodecode/model/validators.py:935 +#: rhodecode/model/validators.py:913 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "Rewizja %(revs)s jest już częścią nowej gałęzi więc określ jego status" -#: rhodecode/model/validators.py:966 -#: rhodecode/model/validation_schema/validators.py:40 -#: rhodecode/model/validation_schema/validators.py:53 +#: rhodecode/model/validators.py:946 +#: rhodecode/model/validation_schema/validators.py:41 +#: rhodecode/model/validation_schema/validators.py:54 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "Proszę podać poprawny adres IPv4 lub IPv6" -#: rhodecode/model/validators.py:967 +#: rhodecode/model/validators.py:947 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "Rozmiar sieci (bits) może mieścić się w zakresie od 0-32 (nie %(bits)r)" -#: rhodecode/model/validators.py:994 +#: rhodecode/model/validators.py:975 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "Klucz nazwy może składać się tylko z liter, podkreślenia, myślnika lub numerów" -#: rhodecode/model/validators.py:1009 +#: rhodecode/model/validators.py:992 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: rhodecode/model/validators.py:1012 +#: rhodecode/model/validators.py:995 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "" -#: rhodecode/model/validators.py:1015 +#: rhodecode/model/validators.py:998 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validators.py:1017 +#: rhodecode/model/validators.py:1000 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validation_schema/validators.py:61 +#: rhodecode/model/validators.py:1068 +msgid "Url must start with http or /" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:62 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:70 +#: rhodecode/model/validation_schema/validators.py:71 msgid "Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/validators.py:132 +#: rhodecode/model/validation_schema/validators.py:133 msgid "" "Invalid clone url, provide a valid clone url starting with one of " "{allowed_prefixes}" msgstr "" -#: rhodecode/model/validation_schema/validators.py:138 +#: rhodecode/model/validation_schema/validators.py:139 msgid "invalid clone url for {repo_type} repository" msgstr "" +#: rhodecode/model/validation_schema/validators.py:148 +msgid "Please enter a valid json object" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -4078,35 +4083,35 @@ msgstr "" msgid "Integration scope" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 msgid "General integration options" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 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:113 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: 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:136 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4146,451 +4151,451 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: 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/rhodecode-components.js:28706 +#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: 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/rhodecode-components.js:30637 +#: rhodecode/public/js/scripts.js:22485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: 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/rhodecode-components.js:30638 +#: rhodecode/public/js/scripts.js:22486 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: 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/rhodecode-components.js:30639 +#: rhodecode/public/js/scripts.js:22487 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: 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/rhodecode-components.js:30640 +#: rhodecode/public/js/scripts.js:22488 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: 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/rhodecode-components.js:30641 +#: rhodecode/public/js/scripts.js:22489 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: 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/rhodecode-components.js:30642 +#: rhodecode/public/js/scripts.js:22490 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: 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/rhodecode-components.js:30662 +#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: 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/rhodecode-components.js:30670 +#: rhodecode/public/js/scripts.js:22518 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: 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/rhodecode-components.js:30682 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: 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/rhodecode-components.js:30684 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: 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/rhodecode-components.js:30688 +#: rhodecode/public/js/scripts.js:22536 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: 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/rhodecode-components.js:30690 +#: rhodecode/public/js/scripts.js:22538 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: 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/rhodecode-components.js:30692 +#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: 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-components.js:44751 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: 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-components.js:44754 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: 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-components.js:44757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: 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-components.js:44760 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: 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-components.js:44764 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: 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:43213 -#: rhodecode/public/js/scripts.js:35061 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:44766 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: 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:43218 -#: rhodecode/public/js/scripts.js:35066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:44771 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: 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-components.js:44773 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: 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-components.js:44778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: 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-components.js:44780 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: 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-components.js:44784 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: 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-components.js:44786 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: 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/rhodecode-components.js:45724 +#: rhodecode/public/js/scripts.js:37528 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: 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/rhodecode-components.js:45726 +#: rhodecode/public/js/scripts.js:37530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: 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/rhodecode-components.js:46172 +#: rhodecode/public/js/scripts.js:37976 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: 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/rhodecode-components.js:46191 +#: rhodecode/public/js/scripts.js:37995 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: 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/rhodecode-components.js:46210 +#: rhodecode/public/js/scripts.js:38014 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:44673 -#: rhodecode/public/js/scripts.js:36521 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:46230 +#: rhodecode/public/js/scripts.js:38034 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: 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/rhodecode-components.js:46597 +#: rhodecode/public/js/scripts.js:38401 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: 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/rhodecode-components.js:46681 +#: rhodecode/public/js/scripts.js:38485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: 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/rhodecode-components.js:46696 +#: rhodecode/public/js/scripts.js:38500 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: 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:45296 -#: rhodecode/public/js/scripts.js:37144 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:46853 +#: rhodecode/public/js/scripts.js:38657 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Przesyłanie..." -#: 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/rhodecode-components.js:46904 +#: rhodecode/public/js/scripts.js:38708 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: 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:45452 -#: rhodecode/public/js/scripts.js:37300 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:538 +#: rhodecode/public/js/rhodecode-components.js:47014 +#: rhodecode/public/js/scripts.js:38818 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/comments.js:543 msgid "Delete this comment?" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47084 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:613 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47161 +#: rhodecode/public/js/scripts.js:38965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode/comments.js:690 msgid "Leave a comment on line {0}." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47275 +#: rhodecode/public/js/scripts.js:39079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/comments.js:804 msgid "TODO from comment {0} was fixed." msgstr "" -#: 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/rhodecode-components.js:47455 +#: rhodecode/public/js/scripts.js:39259 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: 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/rhodecode-components.js:47457 +#: rhodecode/public/js/scripts.js:39261 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: 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/rhodecode-components.js:47466 +#: rhodecode/public/js/scripts.js:39270 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: 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:46065 -#: rhodecode/public/js/scripts.js:37913 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode-components.js:47601 +#: rhodecode/public/js/scripts.js:39405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Wybór linku" -#: 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/rhodecode-components.js:47641 +#: rhodecode/public/js/scripts.js:39445 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: 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:46106 -#: rhodecode/public/js/scripts.js:37954 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/rhodecode-components.js:47642 +#: rhodecode/public/js/scripts.js:39446 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Nie obserwuj" -#: 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/rhodecode-components.js:47651 +#: rhodecode/public/js/scripts.js:39455 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Zacznij obserwację tego repozytorium" -#: 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/rhodecode-components.js:47652 +#: rhodecode/public/js/scripts.js:39456 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Obserwuj" -#: 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/rhodecode-components.js:48032 +#: rhodecode/public/js/scripts.js:39836 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: 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:46510 -#: rhodecode/public/js/scripts.js:38358 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:48041 +#: rhodecode/public/js/scripts.js:39845 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48046 +#: rhodecode/public/js/scripts.js:39850 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: 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/rhodecode-components.js:48052 +#: rhodecode/public/js/scripts.js:39856 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48068 +#: rhodecode/public/js/scripts.js:39872 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46530 -#: rhodecode/public/js/scripts.js:38378 +#: rhodecode/public/js/rhodecode-components.js:48075 +#: rhodecode/public/js/scripts.js:39879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48082 +#: rhodecode/public/js/scripts.js:39886 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48096 +#: rhodecode/public/js/scripts.js:39900 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48198 +#: rhodecode/public/js/scripts.js:40002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:300 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46823 -#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode-components.js:48204 +#: rhodecode/public/js/scripts.js:40008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +msgid "User `{0}` already in reviewers" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48334 +#: rhodecode/public/js/scripts.js:40138 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:436 msgid "added manually by \"{0}\"" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48338 +#: rhodecode/public/js/scripts.js:40142 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:440 msgid "member of \"{0}\"" msgstr "" -#: 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/rhodecode-components.js:48924 +#: rhodecode/public/js/scripts.js:40728 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: 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/rhodecode-components.js:48944 +#: rhodecode/public/js/scripts.js:40748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: 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 +#: rhodecode/public/js/rhodecode-components.js:49356 +#: rhodecode/public/js/scripts.js:41160 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode.js:574 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 +#: rhodecode/public/js/rhodecode-components.js:49364 +#: rhodecode/public/js/scripts.js:41168 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/src/rhodecode.js:582 msgid "Specified expiration date" msgstr "" @@ -4599,174 +4604,180 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:488 -#: rhodecode/templates/codeblocks/diffs.mako:493 +#: rhodecode/templates/codeblocks/diffs.mako:494 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Add another comment" msgstr "Dodaj kolejny komentarz" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "Zamknij" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 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/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No branches available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No forks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No gists available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No repositories available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No repository groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 msgid "No ssh keys available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 msgid "No tags available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 msgid "No user groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No users available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: 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:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "files" msgstr "pliki" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "wczytywanie..." -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} active out of {1} users" msgstr "{0} aktywnych z {1} użytkowników" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 msgid "{0} out of {1} ssh keys" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 msgid "{0} years" msgstr "" @@ -4840,12 +4851,17 @@ msgstr "Jako administrator uprawnienia tej grupy, i możesz je edytować" msgid "Edit Repository Group" msgstr "Edytuj Grupę Repozytoriów" -#: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:68 +msgid "No repositories or repositories groups exists here." +msgstr "" + +#: rhodecode/templates/index_base.mako:86 +#: rhodecode/templates/index_base.mako:116 #: rhodecode/templates/admin/gists/index.mako:112 #: 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_user_group_membership.mako:39 #: 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 @@ -4862,13 +4878,14 @@ msgstr "Edytuj Grupę Repozytoriów" msgid "Name" msgstr "Nazwa" -#: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/index_base.mako:89 +#: rhodecode/templates/index_base.mako:119 #: 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/my_account/my_account_user_group_membership.mako:44 #: 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:55 @@ -4898,20 +4915,21 @@ msgstr "Nazwa" #: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 -#: rhodecode/templates/summary/components.mako:82 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "Opis" -#: rhodecode/templates/index_base.mako:103 -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:92 +#: rhodecode/templates/index_base.mako:122 #: 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/index_base.mako:94 +#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 @@ -4923,11 +4941,11 @@ msgstr "Ostatnia akytwność" #: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:68 -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:209 msgid "Owner" msgstr "Właściciel" -#: rhodecode/templates/index_base.mako:134 +#: rhodecode/templates/index_base.mako:125 #: 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 @@ -4939,7 +4957,7 @@ msgstr "Właściciel" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4956,7 +4974,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:341 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:343 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Zaloguj się" @@ -4980,7 +4998,7 @@ msgstr "" #: rhodecode/templates/login.mako:68 #: rhodecode/templates/password_reset.mako:37 -#: rhodecode/templates/base/base.mako:46 +#: rhodecode/templates/base/base.mako:48 #: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "" @@ -5135,7 +5153,7 @@ msgid "Repository" msgstr "Repozytorium" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:77 msgid "Admin audit logs" msgstr "" @@ -5322,7 +5340,7 @@ 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/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 @@ -5396,7 +5414,7 @@ msgstr "" #: 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:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5499,8 +5517,8 @@ msgstr "Grupy Repozytoriów" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: 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:249 +#: rhodecode/templates/base/base.mako:86 +#: rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "Ustawienia" @@ -5603,7 +5621,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:355 +#: rhodecode/templates/base/base.mako:357 msgid "My account" msgstr "Moje konto" @@ -5631,35 +5649,40 @@ msgstr "" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:36 -msgid "OAuth Identities" +#: rhodecode/templates/admin/my_account/my_account.mako:33 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 +msgid "User Group Membership" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:38 +msgid "OAuth Identities" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "Watched" msgstr "Obserwowane" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:43 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 -#: rhodecode/templates/base/base.mako:239 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "Połączone gałęzie" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:44 #: 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 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:82 msgid "Permissions" msgstr "Uprawnienia" -#: rhodecode/templates/admin/my_account/my_account.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:45 msgid "Live Notifications" msgstr "" @@ -5885,6 +5908,23 @@ msgid "" "sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +msgid "Click add to use this generate SSH key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 +#: 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: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 +#: rhodecode/templates/admin/users/users.mako:74 +msgid "Active" +msgstr "Aktywny" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" @@ -6098,8 +6138,8 @@ msgstr "Repozytorium grupy" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:77 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:153 msgid "Repository groups" msgstr "Repozytorium grupy" @@ -6288,7 +6328,7 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:196 +#: rhodecode/templates/base/base.mako:198 msgid "Clone from" msgstr "Klonuj z" @@ -6368,7 +6408,7 @@ msgid "Remote" msgstr "Zdalnie" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:143 +#: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "Statystyki" @@ -6393,100 +6433,104 @@ msgstr "" msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Attached scoped tokens" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:25 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 msgid "Set" msgstr "Ustaw" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40 msgid "Manually set this repository as a fork of another from the list" msgstr "Ręczne ustawienie rozwidlenia z listy" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:49 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 msgid "" "All actions made on this repository will be visible to everyone following " "the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "" "Force repository locking. This only works when anonymous access is disabled." " Pulling from the repository locks the repository to that user until the " "same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "Ustaw jako rozwidlenie" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "Usuń rozwidlenie" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 #: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Potwierdź usunięcie repozytorium: %s" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 msgid "" "This repository will be renamed in a special way in order to make it " "inaccessible to RhodeCode Enterprise and its VCS systems. If you need to " @@ -6494,11 +6538,11 @@ msgid "" "rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" @@ -6546,17 +6590,6 @@ msgstr "Prefiks" msgid "Key" 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: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 -#: rhodecode/templates/admin/users/users.mako:74 -msgid "Active" -msgstr "Aktywny" - #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" @@ -6718,8 +6751,8 @@ msgid "Settings for Repository: %s" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 -msgid "Non-changeable id" -msgstr "Brak zmiennej id" +msgid "permalink id" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" @@ -6913,7 +6946,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:210 +#: rhodecode/templates/admin/settings/settings_visual.mako:214 msgid "Save settings" msgstr "Zapisz ustawienia" @@ -7207,6 +7240,14 @@ msgstr "" msgid "Gunicorn process management" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:11 +msgid "start auto refresh" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:12 +msgid "stop auto refresh" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -7257,13 +7298,6 @@ msgstr "" msgid "Cleanup sessions" msgstr "" -#: rhodecode/templates/admin/settings/settings_supervisor_tail.mako:1 -#, python-format -msgid "" -"Last %(size)s bytes of process logs, use ?offset=[num] GET param to set " -"custom size" -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7419,24 +7453,26 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:170 -msgid "Clone URL" +msgid "Clone URL templates" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:179 +#: rhodecode/templates/admin/settings/settings_visual.mako:181 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" " {user} current user username,\n" +" {sys_user} current system user running this process, usefull for ssh,\n" +" {hostname} hostname of this server running RhodeCode,\n" " {netloc} network location/server host of running RhodeCode server,\n" " {repo} full repository name,\n" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:192 +#: rhodecode/templates/admin/settings/settings_visual.mako:196 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:200 +#: rhodecode/templates/admin/settings/settings_visual.mako:204 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7451,8 +7487,8 @@ msgstr "Dodaj grupę użytkowników" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:79 -#: rhodecode/templates/base/base.mako:154 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:156 msgid "User groups" msgstr "Grupy użytkowników" @@ -7600,7 +7636,7 @@ msgstr "Dodaj użytkownika" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:80 msgid "Users" msgstr "Użytkownicy" @@ -7864,13 +7900,17 @@ msgstr "" msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:25 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" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 +msgid "Use this generated key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +msgid "Confirmation required on the next screen" msgstr "" #: rhodecode/templates/admin/users/users.mako:5 @@ -7881,174 +7921,174 @@ msgstr "Administracja użytkownikami" msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:53 +#: rhodecode/templates/base/base.mako:55 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:83 msgid "Authentication" msgstr "Autentykacja" -#: rhodecode/templates/base/base.mako:83 +#: rhodecode/templates/base/base.mako:85 msgid "Defaults" msgstr "Domyślne" -#: rhodecode/templates/base/base.mako:101 +#: rhodecode/templates/base/base.mako:103 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:188 +#: rhodecode/templates/base/base.mako:190 msgid "Fork of" msgstr "Gałąź z" -#: rhodecode/templates/base/base.mako:205 +#: rhodecode/templates/base/base.mako:207 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:210 +#: rhodecode/templates/base/base.mako:212 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:228 +#: rhodecode/templates/base/base.mako:230 #: 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/base/base.mako:231 #: 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/base/base.mako:232 #: 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:231 +#: rhodecode/templates/base/base.mako:233 #: 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:235 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Pokaż Prośby Pobrania %s" -#: rhodecode/templates/base/base.mako:245 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Opcje" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: 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/base/base.mako:269 +#: rhodecode/templates/base/base.mako:413 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Szukaj" -#: rhodecode/templates/base/base.mako:271 +#: rhodecode/templates/base/base.mako:273 msgid "Unlock" msgstr "Odblokowany" -#: rhodecode/templates/base/base.mako:273 +#: rhodecode/templates/base/base.mako:275 msgid "Lock" msgstr "zablokowane" -#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/base/base.mako:280 #: 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:279 +#: rhodecode/templates/base/base.mako:281 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:303 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:309 +#: rhodecode/templates/base/base.mako:311 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/base/base.mako:328 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:336 +#: rhodecode/templates/base/base.mako:338 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:338 +#: rhodecode/templates/base/base.mako:340 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:357 +#: rhodecode/templates/base/base.mako:359 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:361 +#: rhodecode/templates/base/base.mako:363 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:393 +#: rhodecode/templates/base/base.mako:395 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:396 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:15 msgid "Journal" msgstr "Dziennik" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:401 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:402 msgid "Public journal" msgstr "Dziennik publiczny" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:407 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:408 msgid "Gists" msgstr "Gists" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:412 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/base/base.mako:418 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:433 -#: rhodecode/templates/base/base.mako:434 +#: rhodecode/templates/base/base.mako:435 +#: rhodecode/templates/base/base.mako:436 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8070,15 +8110,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:491 +#: rhodecode/templates/base/base.mako:493 msgid "Go to" msgstr "Idź do" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:546 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:554 msgid "Site-wide shortcuts" msgstr "" @@ -8185,8 +8225,8 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:274 -#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:325 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8531,10 +8571,10 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changelog/changelog_elements.mako:121 #: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 -#: rhodecode/templates/summary/summary_commits.mako:62 +#: rhodecode/templates/summary/summary_commits.mako:68 #, python-format msgid "Bookmark %s" msgstr "Zakładki %s" @@ -8553,10 +8593,10 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changelog/changelog_elements.mako:113 #: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 -#: rhodecode/templates/summary/summary_commits.mako:76 +#: rhodecode/templates/summary/summary_commits.mako:82 #, python-format msgid "Branch %s" msgstr "Gałęzie %s" @@ -8621,79 +8661,79 @@ msgstr "Nie ma jeszcze zmian" msgid "load previous" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/summary/summary_commits.mako:21 +#: rhodecode/templates/changelog/changelog_elements.mako:32 +#: rhodecode/templates/summary/summary_commits.mako:27 #, python-format msgid "" "Commit status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/summary/summary_commits.mako:25 +#: rhodecode/templates/changelog/changelog_elements.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: {}" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/summary/summary_commits.mako:31 +#: rhodecode/templates/changelog/changelog_elements.mako:42 +#: rhodecode/templates/summary/summary_commits.mako:37 msgid "Commit status: Not Reviewed" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/summary/summary_commits.mako:36 +#: rhodecode/templates/changelog/changelog_elements.mako:47 +#: rhodecode/templates/summary/summary_commits.mako:42 msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changelog/changelog_elements.mako:58 #: rhodecode/templates/changeset/changeset.mako:42 msgid "Copy the full commit id" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changelog/changelog_elements.mako:65 #: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:72 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: rhodecode/templates/changeset/changeset.mako:50 #: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:72 #: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: 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/changelog/changelog_elements.mako:83 +#: rhodecode/templates/compare/compare_commits.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changelog/changelog_elements.mako:107 #: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "połącz" -#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 -#: rhodecode/templates/summary/summary_commits.mako:69 +#: rhodecode/templates/summary/summary_commits.mako:75 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "Tagi %s" -#: rhodecode/templates/changelog/changelog_elements.mako:137 +#: rhodecode/templates/changelog/changelog_elements.mako:143 msgid "load next" msgstr "" @@ -8728,7 +8768,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:81 +#: rhodecode/templates/changeset/changeset_file_comment.mako:82 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8744,8 +8784,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:445 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:451 +#: rhodecode/templates/codeblocks/diffs.mako:454 msgid "Raw diff" msgstr "Raw różnic" @@ -8762,8 +8802,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:452 -#: rhodecode/templates/codeblocks/diffs.mako:455 +#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:461 msgid "Download diff" msgstr "Pobierz różnice" @@ -8787,103 +8827,103 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:32 +#: rhodecode/templates/changeset/changeset_file_comment.mako:33 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:39 +#: rhodecode/templates/changeset/changeset_file_comment.mako:40 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:66 -#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:67 +#: rhodecode/templates/changeset/changeset_file_comment.mako:69 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:73 +#: rhodecode/templates/changeset/changeset_file_comment.mako:74 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:88 +#: rhodecode/templates/changeset/changeset_file_comment.mako:89 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 msgid "Pull request author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +#: rhodecode/templates/changeset/changeset_file_comment.mako:98 msgid "author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:105 +#: rhodecode/templates/changeset/changeset_file_comment.mako:106 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:109 -#: rhodecode/templates/changeset/changeset_file_comment.mako:124 +#: rhodecode/templates/changeset/changeset_file_comment.mako:110 +#: rhodecode/templates/changeset/changeset_file_comment.mako:125 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:121 +#: rhodecode/templates/changeset/changeset_file_comment.mako:122 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:151 -#: rhodecode/templates/changeset/changeset_file_comment.mako:154 -msgid "Prev" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:152 #: rhodecode/templates/changeset/changeset_file_comment.mako:155 +msgid "Prev" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:153 +#: rhodecode/templates/changeset/changeset_file_comment.mako:156 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:191 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:193 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:195 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: 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:65 +msgid "You need to be logged in to leave comments." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Zaloguj się teraz" -#: rhodecode/templates/changeset/changeset_file_comment.mako:348 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "" "Use @username inside this text to send notification to this RhodeCode user" msgstr "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do użytkownika strony" -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 +#: rhodecode/templates/changeset/changeset_file_comment.mako:352 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:368 +#: rhodecode/templates/changeset/changeset_file_comment.mako:369 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Zamknięte" -#: rhodecode/templates/changeset/changeset_file_comment.mako:398 +#: rhodecode/templates/changeset/changeset_file_comment.mako:399 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8980,71 +9020,71 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:290 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/codeblocks/diffs.mako:356 #: 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 +#: rhodecode/templates/codeblocks/diffs.mako:421 +#: rhodecode/templates/codeblocks/diffs.mako:437 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:417 -#: rhodecode/templates/codeblocks/diffs.mako:424 +#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:430 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:422 -#: rhodecode/templates/codeblocks/diffs.mako:438 +#: rhodecode/templates/codeblocks/diffs.mako:428 +#: rhodecode/templates/codeblocks/diffs.mako:444 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:433 -#: rhodecode/templates/codeblocks/diffs.mako:440 +#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:446 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:643 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:651 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:649 +#: rhodecode/templates/codeblocks/diffs.mako:655 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:650 +#: rhodecode/templates/codeblocks/diffs.mako:656 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:660 +#: rhodecode/templates/codeblocks/diffs.mako:666 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:664 +#: rhodecode/templates/codeblocks/diffs.mako:670 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:668 +#: rhodecode/templates/codeblocks/diffs.mako:674 msgid "Wide Mode Diff" msgstr "" @@ -9061,11 +9101,11 @@ msgid "Compare was calculated based on this shared commit." msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:78 msgid "No commits in this compare" msgstr "" @@ -9636,7 +9676,7 @@ msgid "Close File List" msgstr "" #: rhodecode/templates/files/files_browser.mako:25 -#: rhodecode/templates/summary/summary_commits.mako:103 +#: rhodecode/templates/summary/summary_commits.mako:109 msgid "Add New File" msgstr "" @@ -9912,12 +9952,12 @@ msgid "Pull request reviewers" msgstr "Recenzje wniosków połączenia gałęzi" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 msgid "Add reviewer or reviewer group" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:504 +#: rhodecode/templates/pullrequests/pullrequest.mako:508 msgid "Please select source and target" msgstr "" @@ -9925,19 +9965,19 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:364 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:368 +#: rhodecode/templates/pullrequests/pullrequest.mako:371 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:431 +#: rhodecode/templates/pullrequests/pullrequest.mako:435 msgid "Target repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:441 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Select commit reference" msgstr "" @@ -9998,8 +10038,7 @@ msgid "Merge" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:140 -#: rhodecode/templates/summary/components.mako:53 -#: rhodecode/templates/summary/components.mako:69 +#: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" @@ -10079,85 +10118,81 @@ msgid "Pull request versions not available" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 msgid "Save Changes" msgstr "Zapisz zmiany" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 -msgid "Mandatory reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 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:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 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:431 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 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:442 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 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:482 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:593 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:596 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 msgid "show them" msgstr "" @@ -10268,74 +10303,59 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/components.mako:49 -msgid "Read-only url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -#: rhodecode/templates/summary/components.mako:72 +#: rhodecode/templates/summary/components.mako:71 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:76 +msgid "Copy the clone by ssh url" +msgstr "" -#: 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 +#: rhodecode/templates/summary/components.mako:80 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:65 -msgid "Clone url" -msgstr "Url klonowania" - -#: rhodecode/templates/summary/components.mako:94 +#: rhodecode/templates/summary/components.mako:100 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:110 +#: rhodecode/templates/summary/components.mako:116 msgid "Number of Repository Forks" msgstr "" -#: rhodecode/templates/summary/components.mako:118 +#: rhodecode/templates/summary/components.mako:124 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:149 +#: rhodecode/templates/summary/components.mako:155 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:153 +#: rhodecode/templates/summary/components.mako:159 msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" -#: rhodecode/templates/summary/components.mako:156 +#: rhodecode/templates/summary/components.mako:162 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:167 +#: rhodecode/templates/summary/components.mako:173 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:173 +#: rhodecode/templates/summary/components.mako:179 msgid "There are no downloads yet" msgstr "Nie pobrano jeszcze plików" -#: rhodecode/templates/summary/components.mako:177 +#: rhodecode/templates/summary/components.mako:183 msgid "Downloads are disabled for this repository" msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" -#: rhodecode/templates/summary/components.mako:180 +#: rhodecode/templates/summary/components.mako:186 msgid "enable downloads" msgstr "" @@ -10368,15 +10388,15 @@ msgstr "%s ATOM" msgid "%s RSS feed" msgstr "%s RSS" -#: rhodecode/templates/summary/summary_commits.mako:100 +#: rhodecode/templates/summary/summary_commits.mako:106 msgid "Add or upload files directly via RhodeCode:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:111 +#: rhodecode/templates/summary/summary_commits.mako:117 msgid "Push new repo:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:128 msgid "Existing repository?" msgstr "Istniejące repozytorium?" @@ -10404,11 +10424,3 @@ msgstr "" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" msgstr "" - -#: rhodecode/tests/lib/test_ext_json.py:163 -msgid "singular" -msgid_plural "plural" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" diff --git a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo index 0d5cfb0a..14e39a7d 100644 Binary files a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo and b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo differ diff --git a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po index 711dab87..0975b93c 100644 --- a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po @@ -1,5 +1,5 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2017 RhodeCode GmbH +# Copyright (C) 2018 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-11-03 16:42+0100\n" -"PO-Revision-Date: 2017-11-03 15:43+0000\n" +"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"PO-Revision-Date: 2018-01-30 16:33+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Portuguese (http://www.transifex.com/rhodecode/RhodeCode/language/pt/)\n" "MIME-Version: 1.0\n" @@ -21,32 +21,53 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/apps/_base/__init__.py:142 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "" + +#: rhodecode/apps/_base/__init__.py:146 +#, python-format +msgid "Error creating repository %s" +msgstr "Erro ao criar repositório %s" + +#: rhodecode/apps/_base/__init__.py:219 +#, python-format +msgid "" +"The repository `%(repo_name)s` cannot be loaded in filesystem. Please check " +"if it exist, or is not damaged." +msgstr "" + +#: rhodecode/apps/_base/__init__.py:274 +msgid "Editing user `{}` is disabled." +msgstr "" + +#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "Global" -#: rhodecode/apps/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:74 #: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "VCS" -#: rhodecode/apps/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:76 msgid "Visual" msgstr "Visual" -#: rhodecode/apps/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:78 msgid "Remap and Rescan" msgstr "Remapear e Reescanear" -#: rhodecode/apps/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:80 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "Registro de ocorrências" -#: rhodecode/apps/admin/navigation.py:89 -#: rhodecode/integrations/types/email.py:232 +#: rhodecode/apps/admin/navigation.py:82 +#: rhodecode/integrations/types/email.py:233 #: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 @@ -58,15 +79,15 @@ msgstr "Registro de ocorrências" msgid "Email" msgstr "E-mail" -#: rhodecode/apps/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:84 msgid "Hooks" msgstr "Ganchos" -#: rhodecode/apps/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:86 msgid "Full Text Search" msgstr "Busca de texto completa" -#: rhodecode/apps/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:88 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -80,28 +101,28 @@ msgstr "Busca de texto completa" #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 #: rhodecode/templates/admin/repos/repo_edit.mako:75 -#: rhodecode/templates/base/base.mako:82 +#: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "Integrações" -#: rhodecode/apps/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:90 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "Informações do Sistema" -#: rhodecode/apps/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:92 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:94 msgid "User Sessions" msgstr "Sessões do usuário" -#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/apps/admin/navigation.py:96 msgid "Open Source Licenses" msgstr "Licenças Open Source" -#: rhodecode/apps/admin/navigation.py:109 +#: rhodecode/apps/admin/navigation.py:101 msgid "Labs" msgstr "Labs" @@ -113,13 +134,13 @@ msgstr "Configurações padrão atualizadas com sucesso" msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:121 +#: rhodecode/apps/admin/views/permissions.py:120 msgid "Application permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:141 #: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:287 +#: rhodecode/apps/admin/views/permissions.py:288 msgid "Error occurred during update of permissions" msgstr "Ocorreu um erro durante a atualização das permissões" @@ -127,11 +148,11 @@ msgstr "Ocorreu um erro durante a atualização das permissões" msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:267 +#: rhodecode/apps/admin/views/permissions.py:268 msgid "Global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/apps/admin/views/permissions.py:450 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:208 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -152,20 +173,20 @@ msgstr "" msgid "Edit" msgstr "Editar" -#: rhodecode/apps/admin/views/permissions.py:476 +#: rhodecode/apps/admin/views/permissions.py:478 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:479 +#: rhodecode/apps/admin/views/permissions.py:481 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:180 +#: rhodecode/apps/admin/views/repo_groups.py:181 #, python-format msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: rhodecode/apps/admin/views/repo_groups.py:198 +#: rhodecode/apps/admin/views/repo_groups.py:199 #, 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" @@ -174,10 +195,86 @@ msgstr "Ocorreu um erro durante a criação do grupo de repositórios %s" msgid "Cleaned up old sessions" msgstr "Limpar sessões antigas" -#: rhodecode/apps/admin/views/sessions.py:98 +#: rhodecode/apps/admin/views/sessions.py:97 msgid "Failed to cleanup up old sessions" msgstr "Falha ao limpar sessões antigas" +#: rhodecode/apps/admin/views/settings.py:162 +#: rhodecode/apps/admin/views/settings.py:708 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:351 +msgid "Error occurred during updating application settings" +msgstr "Ocorreu um erro durante a atualização das configurações da aplicação" + +#: rhodecode/apps/admin/views/settings.py:194 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +msgid "Updated VCS settings" +msgstr "Configurações de VCS atualizadas" + +#: rhodecode/apps/admin/views/settings.py:268 +#, python-format +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s" + +#: rhodecode/apps/admin/views/settings.py:347 +msgid "Updated application settings" +msgstr "Configurações da aplicação atualizadas" + +#: rhodecode/apps/admin/views/settings.py:426 +msgid "Updated visualisation settings" +msgstr "Configurações de visualização atualizadas" + +#: rhodecode/apps/admin/views/settings.py:429 +msgid "Error occurred during updating visualisation settings" +msgstr "Ocorreu um erro durante a atualização das configurações de visualização" + +#: rhodecode/apps/admin/views/settings.py:491 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +msgid "Invalid issue tracker pattern: {}" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:508 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:526 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:563 +msgid "Please enter email address" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:581 +msgid "Send email task created" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:631 +msgid "Added new hook" +msgstr "Adicionado novo gancho" + +#: rhodecode/apps/admin/views/settings.py:646 +msgid "Updated hooks" +msgstr "Atualizados os ganchos" + +#: rhodecode/apps/admin/views/settings.py:650 +msgid "Error occurred during hook creation" +msgstr "Ocorreu um erro durante a criação do hook" + +#: rhodecode/apps/admin/views/settings.py:732 +msgid "Error occurred during updating labs settings" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:737 +msgid "Updated Labs settings" +msgstr "" + #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "Configurações do Apache para Subversion geradas." @@ -186,149 +283,153 @@ msgstr "Configurações do Apache para Subversion geradas." msgid "Failed to generate the Apache configuration for Subversion." msgstr "Falha ao gerar configurações do Apache para o Subversion." -#: rhodecode/apps/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:79 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "Nota: Por favor, garanta que o servidor possa acessar `${url}` para que o link de atualização funcione" -#: rhodecode/apps/admin/views/system_info.py:102 +#: rhodecode/apps/admin/views/system_info.py:90 msgid "Update info" msgstr "Atualizar Informações" -#: rhodecode/apps/admin/views/system_info.py:104 +#: rhodecode/apps/admin/views/system_info.py:92 msgid "Check for updates" msgstr "Verificar Atualizações" -#: rhodecode/apps/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:97 msgid "RhodeCode Version" msgstr "Versão do RhodeCode" -#: rhodecode/apps/admin/views/system_info.py:110 +#: rhodecode/apps/admin/views/system_info.py:98 +msgid "Latest version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:99 msgid "RhodeCode Server IP" msgstr "IP do Servidor do RhodeCode" -#: rhodecode/apps/admin/views/system_info.py:111 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "RhodeCode Server ID" msgstr "Identificador do Servidor do RhodeCode" -#: rhodecode/apps/admin/views/system_info.py:112 +#: rhodecode/apps/admin/views/system_info.py:101 msgid "RhodeCode Configuration" msgstr "Configuração do RhodeCode" -#: rhodecode/apps/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "RhodeCode Certificate" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:103 msgid "Workers" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:115 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Worker Type" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "Database" msgstr "Banco de Dados" -#: rhodecode/apps/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:109 msgid "Database version" msgstr "Versão do Banco de Dados" -#: rhodecode/apps/admin/views/system_info.py:124 +#: rhodecode/apps/admin/views/system_info.py:113 msgid "Platform" msgstr "Plataforma" -#: rhodecode/apps/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Platform UUID" msgstr "UUID da Plataforma" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Python version" msgstr "Versão do Python" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:116 msgid "Python path" msgstr "Diretório do Python" -#: rhodecode/apps/admin/views/system_info.py:131 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "CPU" msgstr "CPU" -#: rhodecode/apps/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Load" msgstr "Carga" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Memory" msgstr "Memória" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:123 msgid "Uptime" msgstr "Tempo Ligado" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Storage location" msgstr "Local de armazenamento" -#: rhodecode/apps/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Storage info" msgstr "Informações do armazenamento" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Storage inodes" msgstr "Inodes de Armazenamento" -#: rhodecode/apps/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "Gist storage location" msgstr "Local de armazenamento do Gist" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Gist storage info" msgstr "Informações do armazenamento do Gist" -#: rhodecode/apps/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Archive cache storage location" msgstr "Local de armazenamento do cache" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Archive cache info" msgstr "Informações do armazenamento de cache" -#: rhodecode/apps/admin/views/system_info.py:148 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Temp storage location" msgstr "Local de armazenamento temporário" -#: rhodecode/apps/admin/views/system_info.py:149 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Temp storage info" msgstr "Informações do armazenamento temporário" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Search info" msgstr "Informações de busca" -#: rhodecode/apps/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Search location" msgstr "Local de busca" -#: rhodecode/apps/admin/views/system_info.py:156 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "VCS Backends" msgstr "Servidores VCS" -#: rhodecode/apps/admin/views/system_info.py:157 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "VCS Server" msgstr "Servidor VCS" -#: rhodecode/apps/admin/views/system_info.py:158 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "GIT" msgstr "GIT" -#: rhodecode/apps/admin/views/system_info.py:159 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "HG" msgstr "HG" -#: rhodecode/apps/admin/views/system_info.py:160 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "SVN" msgstr "SVN" @@ -342,188 +443,188 @@ msgstr "" 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 +#: rhodecode/apps/admin/views/users.py:209 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/apps/admin/views/users.py:229 +#: rhodecode/apps/admin/views/users.py:230 #, 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 +#: rhodecode/apps/admin/views/users.py:304 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 +#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/my_account/views/my_account.py:490 #, 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 +#: rhodecode/apps/admin/views/users.py:354 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:358 +#: rhodecode/apps/admin/views/users.py:359 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:366 +#: rhodecode/apps/admin/views/users.py:367 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:371 +#: rhodecode/apps/admin/views/users.py:372 #, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:379 +#: rhodecode/apps/admin/views/users.py:380 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:384 +#: rhodecode/apps/admin/views/users.py:385 #, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:401 +#: rhodecode/apps/admin/views/users.py:402 msgid "Successfully deleted user" msgstr "Usuário excluído com sucesso" -#: rhodecode/apps/admin/views/users.py:407 +#: rhodecode/apps/admin/views/users.py:408 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:473 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 +#: rhodecode/apps/admin/views/users.py:479 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 +#: rhodecode/apps/admin/views/users.py:567 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:583 -#: rhodecode/apps/user_group/views/__init__.py:472 +#: rhodecode/apps/admin/views/users.py:585 +#: rhodecode/apps/user_group/views/__init__.py:448 msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante o salvamento das permissões" -#: rhodecode/apps/admin/views/users.py:608 +#: rhodecode/apps/admin/views/users.py:610 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:613 +#: rhodecode/apps/admin/views/users.py:615 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:622 +#: rhodecode/apps/admin/views/users.py:624 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:661 +#: rhodecode/apps/admin/views/users.py:663 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:667 +#: rhodecode/apps/admin/views/users.py:669 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/apps/admin/views/users.py:671 +#: rhodecode/apps/admin/views/users.py:673 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:676 +#: rhodecode/apps/admin/views/users.py:678 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/apps/admin/views/users.py:701 +#: rhodecode/apps/my_account/views/my_account.py:160 #: 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:737 -#: rhodecode/apps/my_account/views/my_account.py:193 +#: rhodecode/apps/admin/views/users.py:739 +#: rhodecode/apps/my_account/views/my_account.py:194 msgid "Auth token successfully created" msgstr "Token de Autenticação criado com sucesso" -#: rhodecode/apps/admin/views/users.py:766 -#: rhodecode/apps/my_account/views/my_account.py:217 +#: rhodecode/apps/admin/views/users.py:768 +#: rhodecode/apps/my_account/views/my_account.py:218 msgid "Auth token successfully deleted" msgstr "Token de Autenticação removido com sucesso" -#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/admin/views/users.py:840 #: 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/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:849 #: 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/admin/views/users.py:883 #: 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 +#: rhodecode/apps/admin/views/users.py:929 +#: rhodecode/apps/my_account/views/my_account.py:260 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:928 +#: rhodecode/apps/admin/views/users.py:935 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 +#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/my_account/views/my_account.py:266 msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante o salvamento do email" -#: rhodecode/apps/admin/views/users.py:959 +#: rhodecode/apps/admin/views/users.py:966 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1005 +#: rhodecode/apps/admin/views/users.py:1012 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1023 +#: rhodecode/apps/admin/views/users.py:1034 msgid "An error occurred during ip saving" msgstr "Ocorreu um erro durante o salvamento do IP" -#: rhodecode/apps/admin/views/users.py:1027 +#: rhodecode/apps/admin/views/users.py:1038 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1057 +#: rhodecode/apps/admin/views/users.py:1068 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1122 +#: rhodecode/apps/admin/views/users.py:1133 msgid "Groups successfully changed" msgstr "Grupos alterados com sucesso" @@ -548,10 +649,10 @@ 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 +#: rhodecode/public/js/rhodecode-components.js:49320 +#: rhodecode/public/js/scripts.js:41124 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/src/rhodecode.js:538 msgid "Lifetime" msgstr "Tempo de Vida" @@ -602,75 +703,75 @@ msgstr "" 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/apps/home/views.py:218 rhodecode/apps/home/views.py:251 +#: rhodecode/apps/repository/views/repo_pull_requests.py:719 +#: rhodecode/templates/admin/my_account/my_account.mako:41 #: 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:580 +#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:150 +#: rhodecode/templates/base/base.mako:582 msgid "Repositories" msgstr "Repositórios" -#: rhodecode/apps/home/views.py:241 +#: rhodecode/apps/home/views.py:244 msgid "Groups" msgstr "Grupos" -#: rhodecode/apps/home/views.py:261 +#: rhodecode/apps/home/views.py:264 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "diário público" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 msgid "journal" msgstr "diário" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 msgid "Bad captcha" msgstr "Captcha incorreto" -#: rhodecode/apps/login/views.py:281 +#: rhodecode/apps/login/views.py:288 msgid "You have successfully registered with RhodeCode" msgstr "Você se registrou no RhodeCode com sucesso" -#: rhodecode/apps/login/views.py:317 +#: rhodecode/apps/login/views.py:325 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:323 +#: rhodecode/apps/login/views.py:331 msgid "Password reset has been disabled." msgstr "Restauração de senha foi desabilitada." -#: rhodecode/apps/login/views.py:412 +#: rhodecode/apps/login/views.py:420 msgid "Given reset token is invalid" msgstr "O token de restauração informado é inválido" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:428 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/my_account.py:134 +#: rhodecode/apps/my_account/views/my_account.py:135 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/my_account.py:141 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "Senha atualizada com sucesso" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:288 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:465 +#: rhodecode/apps/my_account/views/my_account.py:470 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" @@ -685,7 +786,7 @@ 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 +#: rhodecode/apps/user_group/views/__init__.py:328 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -712,28 +813,28 @@ msgstr "Ocorreu um erro ao invalidar o cache" #: 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:585 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_commits.py:192 #: 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 +#: rhodecode/apps/repository/views/repo_checks.py:98 #, python-format msgid "Created repository %s from %s" msgstr "Repositório %s criado de %s" -#: rhodecode/apps/repository/views/repo_checks.py:104 +#: rhodecode/apps/repository/views/repo_checks.py:107 #, python-format msgid "Forked repository %s as %s" msgstr "Repositório %s bifurcado como %s" -#: rhodecode/apps/repository/views/repo_checks.py:107 +#: rhodecode/apps/repository/views/repo_checks.py:110 #, python-format msgid "Created repository %s" msgstr "Repositório %s criado" @@ -762,13 +863,13 @@ msgstr "" msgid "Increase context for all diffs" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:389 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#: rhodecode/apps/repository/views/repo_commits.py:388 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1129 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:433 +#: rhodecode/apps/repository/views/repo_commits.py:432 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -850,14 +951,14 @@ 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/apps/repository/views/repo_summary.py:322 +#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 #: 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 +#: rhodecode/model/scm.py:804 rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "Etiquetas" @@ -918,12 +1019,12 @@ msgid "" "the path" msgstr "" -#: rhodecode/apps/repository/views/repo_forks.py:144 -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "Compare bifurcação" -#: rhodecode/apps/repository/views/repo_forks.py:250 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" @@ -932,91 +1033,88 @@ msgstr "Ocorreu um erro ao bifurcar o repositório %s" msgid "Repository permissions updated" msgstr "Permissões do repositório atualizadas" -#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +#: rhodecode/apps/repository/views/repo_pull_requests.py:615 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:750 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +#: rhodecode/apps/repository/views/repo_pull_requests.py:775 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +#: rhodecode/apps/repository/views/repo_pull_requests.py:790 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +#: rhodecode/apps/repository/views/repo_pull_requests.py:841 msgid "Successfully opened new pull request" msgstr "Novo pull request criado com sucesso" -#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +#: rhodecode/apps/repository/views/repo_pull_requests.py:844 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +#: rhodecode/apps/repository/views/repo_pull_requests.py:875 +#: rhodecode/apps/repository/views/repo_pull_requests.py:905 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +#: rhodecode/apps/repository/views/repo_pull_requests.py:911 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:946 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1010 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1034 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1060 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: rhodecode/apps/repository/views/repo_settings.py:167 +#: rhodecode/apps/repository/views/repo_settings.py:168 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:193 +#: rhodecode/apps/repository/views/repo_settings.py:194 msgid "Unlocked" msgstr "Destravado" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:199 msgid "Locked" msgstr "Travado" -#: rhodecode/apps/repository/views/repo_settings.py:200 +#: rhodecode/apps/repository/views/repo_settings.py:201 #, 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.py:205 #: 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 +#: rhodecode/apps/repository/views/repo_settings.py:249 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" @@ -1079,28 +1177,18 @@ msgstr "" msgid "Unlocked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +#: rhodecode/apps/repository/views/repo_settings_fields.py:86 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 +#: rhodecode/apps/repository/views/repo_settings_fields.py:108 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 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86 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" @@ -1109,34 +1197,23 @@ msgstr "Realizado pull de localização remota" 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 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Branch" msgstr "Ramo" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Tag" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:299 msgid "Bookmark" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:323 msgid "Closed branches" msgstr "" @@ -1148,41 +1225,41 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:209 +#: rhodecode/apps/user_group/views/__init__.py:184 #, python-format msgid "Updated user group %s" msgstr "Grupo de usuários %s atualizado" -#: rhodecode/apps/user_group/views/__init__.py:231 +#: rhodecode/apps/user_group/views/__init__.py:206 #, 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 +#: rhodecode/apps/user_group/views/__init__.py:232 msgid "Successfully deleted user group" msgstr "Grupo de usuários excluído com sucesso" -#: rhodecode/apps/user_group/views/__init__.py:262 +#: rhodecode/apps/user_group/views/__init__.py:237 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 +#: rhodecode/apps/user_group/views/__init__.py:341 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 +#: rhodecode/apps/user_group/views/__init__.py:356 msgid "User Group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" -#: rhodecode/apps/user_group/views/__init__.py:452 +#: rhodecode/apps/user_group/views/__init__.py:428 msgid "User Group global permissions updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:534 +#: rhodecode/apps/user_group/views/__init__.py:510 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:538 +#: rhodecode/apps/user_group/views/__init__.py:514 msgid "An error occurred during synchronization update" msgstr "" @@ -1209,20 +1286,20 @@ msgstr "" msgid "Auth Cache TTL" msgstr "Tempo de Vida do Cache de Autenticação" -#: rhodecode/authentication/views.py:90 +#: rhodecode/authentication/views.py:93 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:176 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:170 msgid "Auth settings updated successfully." msgstr "Configurações de autenticação atualizadas com sucesso." -#: rhodecode/authentication/views.py:181 +#: rhodecode/authentication/views.py:173 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:191 +#: rhodecode/authentication/views.py:181 msgid "Error occurred during update of auth settings." msgstr "" @@ -1347,11 +1424,11 @@ msgid "Password to authenticate for given user DN." msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 -#: rhodecode/integrations/types/webhook.py:214 +#: rhodecode/integrations/types/webhook.py:220 #: 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:324 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Senha" @@ -1475,56 +1552,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:286 -msgid "Error occurred during updating application settings" -msgstr "Ocorreu um erro durante a atualização das configurações da aplicação" - -#: rhodecode/controllers/admin/settings.py:226 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s" - -#: rhodecode/controllers/admin/settings.py:282 -msgid "Updated application settings" -msgstr "Configurações da aplicação atualizadas" - -#: rhodecode/controllers/admin/settings.py:348 -msgid "Updated visualisation settings" -msgstr "Configurações de visualização atualizadas" - -#: rhodecode/controllers/admin/settings.py:351 -msgid "Error occurred during updating visualisation settings" -msgstr "Ocorreu um erro durante a atualização das configurações de visualização" - -#: rhodecode/controllers/admin/settings.py:444 -msgid "Please enter email address" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:462 -msgid "Send email task created" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:495 -msgid "Added new hook" -msgstr "Adicionado novo gancho" - -#: rhodecode/controllers/admin/settings.py:510 -msgid "Updated hooks" -msgstr "Atualizados os ganchos" - -#: rhodecode/controllers/admin/settings.py:514 -msgid "Error occurred during hook creation" -msgstr "Ocorreu um erro durante a criação do hook" - -#: rhodecode/controllers/admin/settings.py:643 -msgid "Error occurred during updating labs settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:648 -msgid "Updated Labs settings" -msgstr "" - #: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" @@ -1549,35 +1576,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:149 +#: rhodecode/events/repo.py:189 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:158 +#: rhodecode/events/repo.py:198 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:167 +#: rhodecode/events/repo.py:207 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:176 +#: rhodecode/events/repo.py:216 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:256 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:265 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:274 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:285 msgid "repository push" msgstr "" @@ -1628,7 +1655,7 @@ msgstr "" #: 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:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:215 #: 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 @@ -1656,9 +1683,9 @@ msgstr "Limpar" #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: 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/changeset/changeset_file_comment.mako:143 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:148 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1721,81 +1748,81 @@ msgstr "" msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:302 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:327 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:214 +#: rhodecode/integrations/types/email.py:215 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:215 +#: rhodecode/integrations/types/email.py:216 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:220 #: rhodecode/integrations/types/email.py:221 +#: rhodecode/integrations/types/email.py:222 msgid "Email address" msgstr "" -#: rhodecode/integrations/types/email.py:233 +#: rhodecode/integrations/types/email.py:234 msgid "Send repo push summaries to a list of recipients via email" msgstr "" -#: rhodecode/integrations/types/hipchat.py:43 +#: rhodecode/integrations/types/hipchat.py:41 msgid "Yellow" msgstr "" -#: rhodecode/integrations/types/hipchat.py:44 +#: rhodecode/integrations/types/hipchat.py:42 msgid "Red" msgstr "" -#: rhodecode/integrations/types/hipchat.py:45 +#: rhodecode/integrations/types/hipchat.py:43 msgid "Green" msgstr "" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Purple" msgstr "" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Gray" msgstr "" -#: rhodecode/integrations/types/hipchat.py:52 +#: rhodecode/integrations/types/hipchat.py:50 msgid "Hipchat server URL" msgstr "" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:51 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:63 +#: rhodecode/integrations/types/hipchat.py:61 msgid "Notify" msgstr "" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:62 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:70 +#: rhodecode/integrations/types/hipchat.py:68 msgid "Color" msgstr "" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:69 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:99 +#: rhodecode/integrations/types/hipchat.py:97 msgid "Hipchat" msgstr "" -#: rhodecode/integrations/types/hipchat.py:100 +#: rhodecode/integrations/types/hipchat.py:98 msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" @@ -1811,7 +1838,7 @@ msgid "" msgstr "" #: rhodecode/integrations/types/slack.py:60 -#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/integrations/types/webhook.py:210 #: 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 @@ -1822,7 +1849,7 @@ msgstr "" #: 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:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1858,11 +1885,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:177 +#: rhodecode/integrations/types/webhook.py:183 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:185 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 " @@ -1870,53 +1897,53 @@ msgid "" "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:199 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:194 +#: rhodecode/integrations/types/webhook.py:200 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 +#: rhodecode/integrations/types/webhook.py:211 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:215 +#: rhodecode/integrations/types/webhook.py:221 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:225 +#: rhodecode/integrations/types/webhook.py:231 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:226 +#: rhodecode/integrations/types/webhook.py:232 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:235 +#: rhodecode/integrations/types/webhook.py:241 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:236 +#: rhodecode/integrations/types/webhook.py:242 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:245 +#: rhodecode/integrations/types/webhook.py:251 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:246 +#: rhodecode/integrations/types/webhook.py:252 msgid "Select if the Webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:259 +#: rhodecode/integrations/types/webhook.py:265 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:260 +#: rhodecode/integrations/types/webhook.py:266 msgid "Post json events to a Webhook endpoint" msgstr "" @@ -2004,80 +2031,63 @@ msgstr "[passou a seguir] o repositório" msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/action_parser.py:171 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "nome da bifurcação %s" -#: rhodecode/lib/action_parser.py:189 +#: rhodecode/lib/action_parser.py:191 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "Pull request #%s" -#: rhodecode/lib/action_parser.py:223 +#: rhodecode/lib/action_parser.py:226 #, python-format msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:228 +#: rhodecode/lib/action_parser.py:231 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/action_parser.py:235 +#: rhodecode/lib/action_parser.py:238 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:288 +#: rhodecode/lib/action_parser.py:293 #, python-format msgid "Deleted branch: %s" msgstr "Excluído ramo: %s" -#: rhodecode/lib/action_parser.py:291 +#: rhodecode/lib/action_parser.py:296 #, python-format msgid "Created tag: %s" msgstr "Tag criada: %s" -#: rhodecode/lib/action_parser.py:304 +#: rhodecode/lib/action_parser.py:309 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1445 +#: rhodecode/lib/auth.py:1441 #, python-format msgid "IP %s not allowed" msgstr "IP %s não permitido" -#: rhodecode/lib/auth.py:1535 +#: rhodecode/lib/auth.py:1531 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:1577 +#: rhodecode/lib/auth.py:1575 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:62 -msgid "Click to comment" -msgstr "" - -#: rhodecode/lib/diffs.py:77 -msgid "Binary file" -msgstr "Arquivo binário" - -#: rhodecode/lib/diffs.py:98 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Conjunto de mudanças é grande demais e foi cortado, use o menu de diferenças para ver as diferenças" - -#: rhodecode/lib/diffs.py:109 -msgid "No changes detected" -msgstr "Nenhuma alteração detectada" - -#: rhodecode/lib/diffs.py:927 +#: rhodecode/lib/diffs.py:864 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1869 +#: rhodecode/lib/helpers.py:1855 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2097,7 +2107,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1893 +#: rhodecode/lib/helpers.py:1879 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2111,49 +2121,49 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1910 +#: rhodecode/lib/helpers.py:1896 #, 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:525 +#: rhodecode/lib/utils2.py:524 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:531 +#: rhodecode/lib/utils2.py:530 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:540 +#: rhodecode/lib/utils2.py:539 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:542 +#: rhodecode/lib/utils2.py:541 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:544 +#: rhodecode/lib/utils2.py:543 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:546 +#: rhodecode/lib/utils2.py:545 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:548 +#: rhodecode/lib/utils2.py:547 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:550 +#: rhodecode/lib/utils2.py:549 msgid "in ${val} and ${detail}" msgstr "" -#: 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/lib/utils2.py:553 +#: rhodecode/public/js/rhodecode-components.js:30702 +#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "agora há pouco" @@ -2181,6 +2191,7 @@ msgstr "agora há pouco" #: 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_11_0_0.py:2599 #: 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 @@ -2189,7 +2200,7 @@ msgstr "agora há pouco" #: 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 +#: rhodecode/model/db.py:2626 msgid "Repository no access" msgstr "Nenhum acesso ao repositório" @@ -2216,6 +2227,7 @@ msgstr "Nenhum acesso ao repositório" #: 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_11_0_0.py:2600 #: 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 @@ -2224,7 +2236,7 @@ msgstr "Nenhum acesso ao repositório" #: 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 +#: rhodecode/model/db.py:2627 msgid "Repository read access" msgstr "Acesso de leitura ao repositório" @@ -2251,6 +2263,7 @@ msgstr "Acesso de leitura ao repositório" #: 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_11_0_0.py:2601 #: 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 @@ -2259,7 +2272,7 @@ msgstr "Acesso de leitura ao repositório" #: 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 +#: rhodecode/model/db.py:2628 msgid "Repository write access" msgstr "Acesso de escrita ao repositório" @@ -2286,6 +2299,7 @@ msgstr "Acesso de escrita ao repositório" #: 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_11_0_0.py:2602 #: 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 @@ -2294,7 +2308,7 @@ msgstr "Acesso de escrita ao repositório" #: 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 +#: rhodecode/model/db.py:2629 msgid "Repository admin access" msgstr "Acesso administrativo ao repositório" @@ -2361,6 +2375,7 @@ msgstr "Administrador do RhodeCode" #: 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_11_0_0.py:2620 #: 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 @@ -2369,7 +2384,7 @@ msgstr "Administrador do RhodeCode" #: 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 +#: rhodecode/model/db.py:2647 msgid "Repository creation disabled" msgstr "Criação de repositórios desabilitada" @@ -2396,6 +2411,7 @@ msgstr "Criação de repositórios desabilitada" #: 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_11_0_0.py:2621 #: 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 @@ -2404,7 +2420,7 @@ msgstr "Criação de repositórios desabilitada" #: 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 +#: rhodecode/model/db.py:2648 msgid "Repository creation enabled" msgstr "Criação de repositórios habilitada" @@ -2431,6 +2447,7 @@ msgstr "Criação de repositórios habilitada" #: 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_11_0_0.py:2625 #: 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 @@ -2439,7 +2456,7 @@ msgstr "Criação de repositórios habilitada" #: 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 +#: rhodecode/model/db.py:2652 msgid "Repository forking disabled" msgstr "Bifurcação de repositórios desabilitada" @@ -2466,6 +2483,7 @@ msgstr "Bifurcação de repositórios desabilitada" #: 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_11_0_0.py:2626 #: 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 @@ -2474,7 +2492,7 @@ msgstr "Bifurcação de repositórios desabilitada" #: 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 +#: rhodecode/model/db.py:2653 msgid "Repository forking enabled" msgstr "Bifurcação de repositórios habilitada" @@ -2522,6 +2540,7 @@ msgstr "Registro de novo usuário no RhodeCode com auto-ativação" #: 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_11_0_0.py:3328 #: 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 @@ -2530,7 +2549,11 @@ msgstr "Registro de novo usuário no RhodeCode com auto-ativação" #: 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 +#: rhodecode/model/db.py:3355 +#: rhodecode/public/js/rhodecode-components.js:48211 +#: rhodecode/public/js/scripts.js:40015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "Not Reviewed" msgstr "Não Revisado" @@ -2557,6 +2580,7 @@ msgstr "Não Revisado" #: 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_11_0_0.py:3329 #: 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 @@ -2565,7 +2589,7 @@ msgstr "Não Revisado" #: 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 +#: rhodecode/model/db.py:3356 msgid "Approved" msgstr "Aprovado" @@ -2592,6 +2616,7 @@ msgstr "Aprovado" #: 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_11_0_0.py:3330 #: 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 @@ -2600,7 +2625,7 @@ msgstr "Aprovado" #: 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 +#: rhodecode/model/db.py:3357 msgid "Rejected" msgstr "Rejeitado" @@ -2627,6 +2652,7 @@ msgstr "Rejeitado" #: 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_11_0_0.py:3331 #: 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 @@ -2635,7 +2661,7 @@ msgstr "Rejeitado" #: 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 +#: rhodecode/model/db.py:3358 msgid "Under Review" msgstr "Sob Revisão" @@ -2659,6 +2685,7 @@ msgstr "Sob Revisão" #: 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_11_0_0.py:2604 #: 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 @@ -2667,7 +2694,7 @@ msgstr "Sob Revisão" #: 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 +#: rhodecode/model/db.py:2631 msgid "Repository group no access" msgstr "Sem acesso ao grupo de repositórios" @@ -2691,6 +2718,7 @@ msgstr "Sem acesso ao grupo de repositórios" #: 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_11_0_0.py:2605 #: 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 @@ -2699,7 +2727,7 @@ msgstr "Sem acesso ao grupo de repositórios" #: 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 +#: rhodecode/model/db.py:2632 msgid "Repository group read access" msgstr "Acesso de leitura ao grupo de repositórios" @@ -2723,6 +2751,7 @@ msgstr "Acesso de leitura ao grupo de repositórios" #: 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_11_0_0.py:2606 #: 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 @@ -2731,7 +2760,7 @@ msgstr "Acesso de leitura ao grupo de repositórios" #: 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 +#: rhodecode/model/db.py:2633 msgid "Repository group write access" msgstr "Acesso de escrita ao grupo de repositórios" @@ -2755,6 +2784,7 @@ msgstr "Acesso de escrita ao grupo de repositórios" #: 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_11_0_0.py:2607 #: 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 @@ -2763,7 +2793,7 @@ msgstr "Acesso de escrita ao grupo de repositórios" #: 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 +#: rhodecode/model/db.py:2634 msgid "Repository group admin access" msgstr "Acesso administrativo ao grupo de repositórios" @@ -2786,6 +2816,7 @@ msgstr "Acesso administrativo ao grupo de repositórios" #: 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_11_0_0.py:2609 #: 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 @@ -2794,7 +2825,7 @@ msgstr "Acesso administrativo ao grupo de repositórios" #: 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 +#: rhodecode/model/db.py:2636 msgid "User group no access" msgstr "Sem acesso ao grupo de usuários" @@ -2817,6 +2848,7 @@ msgstr "Sem acesso ao grupo de usuários" #: 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_11_0_0.py:2610 #: 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 @@ -2825,7 +2857,7 @@ msgstr "Sem acesso ao grupo de usuários" #: 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 +#: rhodecode/model/db.py:2637 msgid "User group read access" msgstr "Acesso de leitura ao grupo de usuários" @@ -2848,6 +2880,7 @@ msgstr "Acesso de leitura ao grupo de usuários" #: 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_11_0_0.py:2611 #: 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 @@ -2856,7 +2889,7 @@ msgstr "Acesso de leitura ao grupo de usuários" #: 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 +#: rhodecode/model/db.py:2638 msgid "User group write access" msgstr "Acesso de escrita ao grupo de usuários" @@ -2879,6 +2912,7 @@ msgstr "Acesso de escrita ao grupo de usuários" #: 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_11_0_0.py:2612 #: 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 @@ -2887,7 +2921,7 @@ msgstr "Acesso de escrita ao grupo de usuários" #: 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 +#: rhodecode/model/db.py:2639 msgid "User group admin access" msgstr "Acesso administrativo ao grupo de usuários" @@ -2910,6 +2944,7 @@ msgstr "Acesso administrativo ao grupo de usuários" #: 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_11_0_0.py:2614 #: 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 @@ -2918,7 +2953,7 @@ msgstr "Acesso administrativo ao grupo de usuários" #: 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 +#: rhodecode/model/db.py:2641 msgid "Repository Group creation disabled" msgstr "Criação de Grupo de Repositórios desatilibada" @@ -2941,6 +2976,7 @@ msgstr "Criação de Grupo de Repositórios desatilibada" #: 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_11_0_0.py:2615 #: 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 @@ -2949,7 +2985,7 @@ msgstr "Criação de Grupo de Repositórios desatilibada" #: 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 +#: rhodecode/model/db.py:2642 msgid "Repository Group creation enabled" msgstr "Criação de Grupo de Repositórios habilitada" @@ -2972,6 +3008,7 @@ msgstr "Criação de Grupo de Repositórios habilitada" #: 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_11_0_0.py:2617 #: 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 @@ -2980,7 +3017,7 @@ msgstr "Criação de Grupo de Repositórios habilitada" #: 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 +#: rhodecode/model/db.py:2644 msgid "User Group creation disabled" msgstr "Criação de Grupo de Usuários desabilitada" @@ -3003,6 +3040,7 @@ msgstr "Criação de Grupo de Usuários desabilitada" #: 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_11_0_0.py:2618 #: 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 @@ -3011,7 +3049,7 @@ msgstr "Criação de Grupo de Usuários desabilitada" #: 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 +#: rhodecode/model/db.py:2645 msgid "User Group creation enabled" msgstr "Criação de Grupo de Usuários habilitada" @@ -3034,6 +3072,7 @@ msgstr "Criação de Grupo de Usuários habilitada" #: 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_11_0_0.py:2628 #: 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 @@ -3042,7 +3081,7 @@ msgstr "Criação de Grupo de Usuários habilitada" #: 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 +#: rhodecode/model/db.py:2655 msgid "Registration disabled" msgstr "Registro desatilitado" @@ -3065,6 +3104,7 @@ msgstr "Registro desatilitado" #: 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_11_0_0.py:2629 #: 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 @@ -3073,7 +3113,7 @@ msgstr "Registro desatilitado" #: 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 +#: rhodecode/model/db.py:2656 msgid "User Registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" @@ -3096,6 +3136,7 @@ msgstr "Registro de Usuário com ativação manual de conta" #: 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_11_0_0.py:2630 #: 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 @@ -3104,7 +3145,7 @@ msgstr "Registro de Usuário com ativação manual de conta" #: 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 +#: rhodecode/model/db.py:2657 msgid "User Registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" @@ -3127,6 +3168,7 @@ msgstr "Registro de Usuário com ativação automática de conta" #: 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_11_0_0.py:2636 #: 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 @@ -3135,7 +3177,7 @@ msgstr "Registro de Usuário com ativação automática de conta" #: 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 +#: rhodecode/model/db.py:2663 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" @@ -3158,6 +3200,7 @@ msgstr "Ativação manual de conta externa" #: 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_11_0_0.py:2637 #: 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 @@ -3166,7 +3209,7 @@ msgstr "Ativação manual de conta externa" #: 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 +#: rhodecode/model/db.py:2664 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "Ativação automática de conta externa" @@ -3183,6 +3226,7 @@ msgstr "Ativação automática de conta externa" #: 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_11_0_0.py:2622 #: 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 @@ -3191,7 +3235,7 @@ msgstr "Ativação automática de conta externa" #: 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 +#: rhodecode/model/db.py:2649 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3209,6 +3253,7 @@ msgstr "" #: 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_11_0_0.py:2623 #: 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 @@ -3217,7 +3262,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2650 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3232,6 +3277,7 @@ msgstr "" #: 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_11_0_0.py:2597 #: 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 @@ -3240,7 +3286,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2624 msgid "RhodeCode Super Administrator" msgstr "" @@ -3252,6 +3298,7 @@ msgstr "" #: 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_11_0_0.py:2639 #: 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 @@ -3260,7 +3307,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2666 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3272,6 +3319,7 @@ msgstr "" #: 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_11_0_0.py:2640 #: 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 @@ -3280,10 +3328,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2667 msgid "Inherit object permissions from default user enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 #: 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 @@ -3292,10 +3341,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: 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 +#: rhodecode/model/db.py:1107 msgid "all" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3304,10 +3354,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: 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 +#: rhodecode/model/db.py:1108 msgid "http/web interface" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3316,10 +3367,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: 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 +#: rhodecode/model/db.py:1109 msgid "vcs (git/hg/svn protocol)" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3328,10 +3380,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: 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 +#: rhodecode/model/db.py:1110 msgid "api calls" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 #: 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 @@ -3340,10 +3393,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:1111 msgid "feed access" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 #: 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 @@ -3352,60 +3406,51 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2387 msgid "No parent" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 #: 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 +#: rhodecode/model/db.py:2659 msgid "Password reset enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 #: 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 +#: rhodecode/model/db.py:2660 msgid "Password reset hidden" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 #: 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 +#: rhodecode/model/db.py:2661 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:150 -msgid "Invalid search query. Try quoting it." -msgstr "Consulta de busca inválida. Tente usar aspas." - -#: rhodecode/lib/index/whoosh.py:152 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh" - -#: rhodecode/lib/index/whoosh.py:157 -msgid "An error occurred during this search operation" -msgstr "Ocorreu um erro durante essa operação de busca" - -#: rhodecode/lib/index/whoosh.py:165 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:166 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" @@ -3425,28 +3470,28 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:382 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:376 +#: rhodecode/model/comment.py:383 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:87 +#: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "Por favor entre um login" -#: rhodecode/model/forms.py:88 +#: rhodecode/model/forms.py:89 #, 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:98 +#: rhodecode/model/forms.py:99 msgid "Please enter a password" msgstr "Por favor entre com uma senha" -#: rhodecode/model/forms.py:99 +#: rhodecode/model/forms.py:100 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entre com %(min)i caracteres ou mais" @@ -3533,8 +3578,8 @@ msgstr "Ler" #: 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 -#: rhodecode/templates/changeset/changeset_file_comment.mako:321 +#: rhodecode/templates/changeset/changeset_file_comment.mako:272 +#: rhodecode/templates/changeset/changeset_file_comment.mako:322 msgid "Write" msgstr "Gravar" @@ -3568,8 +3613,8 @@ 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:417 -#: rhodecode/templates/base/base.mako:424 +#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:426 msgid "Admin" msgstr "Administrador" @@ -3686,115 +3731,79 @@ msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1218 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1168 +#: rhodecode/model/pull_request.py:1220 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1181 +#: rhodecode/model/pull_request.py:1233 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1200 +#: rhodecode/model/pull_request.py:1252 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1203 +#: rhodecode/model/pull_request.py:1255 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 +#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 msgid "Bookmarks" msgstr "Marcadores" -#: rhodecode/model/pull_request.py:1370 +#: rhodecode/model/pull_request.py:1425 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1373 +#: rhodecode/model/pull_request.py:1428 msgid "Closed Branches" msgstr "Ramos Fechados" -#: rhodecode/model/pull_request.py:1533 +#: rhodecode/model/pull_request.py:1588 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1546 +#: rhodecode/model/pull_request.py:1601 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1561 +#: rhodecode/model/pull_request.py:1616 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1564 +#: rhodecode/model/pull_request.py:1619 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1599 +#: rhodecode/model/pull_request.py:1654 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1604 +#: rhodecode/model/pull_request.py:1659 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1611 +#: rhodecode/model/pull_request.py:1666 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1613 +#: rhodecode/model/pull_request.py:1668 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:762 +#: rhodecode/model/scm.py:775 msgid "latest tip" msgstr "tip mais recente" -#: rhodecode/model/user.py:166 -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:333 -#, python-format -msgid "" -"You can't edit this user (`%(username)s`) since it's crucial for entire " -"application" -msgstr "" - -#: 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: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: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:532 -#, python-format -msgid "" -"user \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups:%s" -msgstr "" - -#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99 +#: rhodecode/model/validators.py:92 rhodecode/model/validators.py:93 msgid "Value cannot be an empty list" msgstr "O valor não pode ser uma lista vazia" -#: rhodecode/model/validators.py:142 +#: rhodecode/model/validators.py:139 msgid "Pattern already exists" msgstr "" @@ -3815,30 +3824,26 @@ msgid "" "dashes and must begin with alphanumeric character or underscore" msgstr "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere alfanumérico" -#: rhodecode/model/validators.py:192 -msgid "The input is not valid" -msgstr "" - -#: rhodecode/model/validators.py:199 +#: rhodecode/model/validators.py:195 #, python-format msgid "Username %(username)s is not valid" msgstr "O username \"%(username)s\" não é válido" -#: rhodecode/model/validators.py:200 +#: rhodecode/model/validators.py:196 #, python-format msgid "Username %(username)s is disabled" msgstr "" -#: rhodecode/model/validators.py:223 +#: rhodecode/model/validators.py:221 msgid "Invalid user group name" msgstr "Nome inválido de grupo de usuários" -#: rhodecode/model/validators.py:224 +#: rhodecode/model/validators.py:222 #, python-format msgid "User group `%(usergroup)s` already exists" msgstr "" -#: rhodecode/model/validators.py:226 +#: rhodecode/model/validators.py:224 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -3866,166 +3871,166 @@ msgstr "" msgid "no permission to store repository group in root location" msgstr "" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:387 msgid "Invalid characters (non-ascii) in password" msgstr "Caracteres inválidos (não-ascii) na senha" -#: rhodecode/model/validators.py:401 -msgid "Invalid old password" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:406 msgid "Passwords do not match" msgstr "Senhas não conferem" -#: rhodecode/model/validators.py:436 +#: rhodecode/model/validators.py:426 msgid "invalid password" msgstr "senha inválida" -#: rhodecode/model/validators.py:437 +#: rhodecode/model/validators.py:427 msgid "invalid user name" msgstr "nome de usuário inválido" -#: rhodecode/model/validators.py:438 +#: rhodecode/model/validators.py:428 msgid "Your account is disabled" msgstr "Sua conta está desabilitada" -#: rhodecode/model/validators.py:470 -msgid "Token mismatch" -msgstr "Descompasso de Token" - -#: rhodecode/model/validators.py:484 +#: rhodecode/model/validators.py:464 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "O nome de repositório %(repo)s não é permitido" -#: rhodecode/model/validators.py:486 +#: rhodecode/model/validators.py:466 #, python-format msgid "Repository with name %(repo)s already exists" msgstr "" -#: rhodecode/model/validators.py:488 +#: rhodecode/model/validators.py:468 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Um Grupo de Repositórios chamado \"%(repo)s\" já existe" -#: rhodecode/model/validators.py:491 +#: rhodecode/model/validators.py:471 #, python-format msgid "Repository with name %(repo)s exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:493 +#: rhodecode/model/validators.py:473 #, python-format msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:566 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219 msgid "Repository name cannot end with .git" msgstr "" -#: rhodecode/model/validators.py:640 +#: rhodecode/model/validators.py:626 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "" -#: rhodecode/model/validators.py:641 +#: rhodecode/model/validators.py:627 #, python-format msgid "" "Invalid clone url, provide a valid clone url starting with one of " "%(allowed_prefixes)s" msgstr "" -#: rhodecode/model/validators.py:670 +#: rhodecode/model/validators.py:659 msgid "Fork have to be the same type as parent" msgstr "A bifurcação deve ser do mesmo tipo que o pai" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:676 msgid "You do not have the permission to create repositories in this group." msgstr "" -#: rhodecode/model/validators.py:688 +#: rhodecode/model/validators.py:679 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "" "You do not have the permission to store repositories in the root location." msgstr "" -#: rhodecode/model/validators.py:748 +#: rhodecode/model/validators.py:739 msgid "This username or user group name is not valid" msgstr "Este nome de usuário ou de grupo de usuários não é válido" -#: rhodecode/model/validators.py:879 +#: rhodecode/model/validators.py:852 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: rhodecode/model/validators.py:894 +#: rhodecode/model/validators.py:870 msgid "This e-mail address is already taken" msgstr "Esse endereço de e-mail já está tomado" -#: rhodecode/model/validators.py:914 +#: rhodecode/model/validators.py:892 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "o e-mail \"%(email)s\" não existe." -#: rhodecode/model/validators.py:935 +#: rhodecode/model/validators.py:913 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "As revisões %(revs)s já fazem parte de um pull request ou já setaram o estado" -#: rhodecode/model/validators.py:966 -#: rhodecode/model/validation_schema/validators.py:40 -#: rhodecode/model/validation_schema/validators.py:53 +#: rhodecode/model/validators.py:946 +#: rhodecode/model/validation_schema/validators.py:41 +#: rhodecode/model/validation_schema/validators.py:54 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "Por favor, forneça um endereço válido IPv4 ou IPv6" -#: rhodecode/model/validators.py:967 +#: rhodecode/model/validators.py:947 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)" -#: rhodecode/model/validators.py:994 +#: rhodecode/model/validators.py:975 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "O nome da chave só pode conter letras, underscore, hífen ou dígitos" -#: rhodecode/model/validators.py:1009 +#: rhodecode/model/validators.py:992 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: rhodecode/model/validators.py:1012 +#: rhodecode/model/validators.py:995 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "" -#: rhodecode/model/validators.py:1015 +#: rhodecode/model/validators.py:998 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validators.py:1017 +#: rhodecode/model/validators.py:1000 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validation_schema/validators.py:61 +#: rhodecode/model/validators.py:1068 +msgid "Url must start with http or /" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:62 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:70 +#: rhodecode/model/validation_schema/validators.py:71 msgid "Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/validators.py:132 +#: rhodecode/model/validation_schema/validators.py:133 msgid "" "Invalid clone url, provide a valid clone url starting with one of " "{allowed_prefixes}" msgstr "" -#: rhodecode/model/validation_schema/validators.py:138 +#: rhodecode/model/validation_schema/validators.py:139 msgid "invalid clone url for {repo_type} repository" msgstr "" +#: rhodecode/model/validation_schema/validators.py:148 +msgid "Please enter a valid json object" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -4074,35 +4079,35 @@ msgstr "" msgid "Integration scope" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 msgid "General integration options" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 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:113 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: 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:136 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4142,451 +4147,451 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: 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/rhodecode-components.js:28706 +#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: 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/rhodecode-components.js:30637 +#: rhodecode/public/js/scripts.js:22485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: 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/rhodecode-components.js:30638 +#: rhodecode/public/js/scripts.js:22486 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: 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/rhodecode-components.js:30639 +#: rhodecode/public/js/scripts.js:22487 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: 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/rhodecode-components.js:30640 +#: rhodecode/public/js/scripts.js:22488 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: 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/rhodecode-components.js:30641 +#: rhodecode/public/js/scripts.js:22489 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: 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/rhodecode-components.js:30642 +#: rhodecode/public/js/scripts.js:22490 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: 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/rhodecode-components.js:30662 +#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: 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/rhodecode-components.js:30670 +#: rhodecode/public/js/scripts.js:22518 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: 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/rhodecode-components.js:30682 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: 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/rhodecode-components.js:30684 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: 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/rhodecode-components.js:30688 +#: rhodecode/public/js/scripts.js:22536 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: 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/rhodecode-components.js:30690 +#: rhodecode/public/js/scripts.js:22538 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: 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/rhodecode-components.js:30692 +#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: 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-components.js:44751 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: 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-components.js:44754 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: 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-components.js:44757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: 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-components.js:44760 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: 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-components.js:44764 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: 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:43213 -#: rhodecode/public/js/scripts.js:35061 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:44766 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: 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:43218 -#: rhodecode/public/js/scripts.js:35066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:44771 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: 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-components.js:44773 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: 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-components.js:44778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: 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-components.js:44780 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: 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-components.js:44784 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: 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-components.js:44786 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: 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/rhodecode-components.js:45724 +#: rhodecode/public/js/scripts.js:37528 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: 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/rhodecode-components.js:45726 +#: rhodecode/public/js/scripts.js:37530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: 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/rhodecode-components.js:46172 +#: rhodecode/public/js/scripts.js:37976 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: 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/rhodecode-components.js:46191 +#: rhodecode/public/js/scripts.js:37995 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: 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/rhodecode-components.js:46210 +#: rhodecode/public/js/scripts.js:38014 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:44673 -#: rhodecode/public/js/scripts.js:36521 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:46230 +#: rhodecode/public/js/scripts.js:38034 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: 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/rhodecode-components.js:46597 +#: rhodecode/public/js/scripts.js:38401 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: 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/rhodecode-components.js:46681 +#: rhodecode/public/js/scripts.js:38485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: 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/rhodecode-components.js:46696 +#: rhodecode/public/js/scripts.js:38500 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: 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:45296 -#: rhodecode/public/js/scripts.js:37144 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:46853 +#: rhodecode/public/js/scripts.js:38657 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Enviando..." -#: 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/rhodecode-components.js:46904 +#: rhodecode/public/js/scripts.js:38708 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: 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:45452 -#: rhodecode/public/js/scripts.js:37300 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:538 +#: rhodecode/public/js/rhodecode-components.js:47014 +#: rhodecode/public/js/scripts.js:38818 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/comments.js:543 msgid "Delete this comment?" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47084 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:613 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47161 +#: rhodecode/public/js/scripts.js:38965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode/comments.js:690 msgid "Leave a comment on line {0}." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47275 +#: rhodecode/public/js/scripts.js:39079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/comments.js:804 msgid "TODO from comment {0} was fixed." msgstr "" -#: 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/rhodecode-components.js:47455 +#: rhodecode/public/js/scripts.js:39259 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: 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/rhodecode-components.js:47457 +#: rhodecode/public/js/scripts.js:39261 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: 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/rhodecode-components.js:47466 +#: rhodecode/public/js/scripts.js:39270 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Nenhum arquivo encontrado" -#: 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/rhodecode-components.js:47601 +#: rhodecode/public/js/scripts.js:39405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Link da seleção" -#: 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/rhodecode-components.js:47641 +#: rhodecode/public/js/scripts.js:39445 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: 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:46106 -#: rhodecode/public/js/scripts.js:37954 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/rhodecode-components.js:47642 +#: rhodecode/public/js/scripts.js:39446 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Parar de seguir" -#: 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/rhodecode-components.js:47651 +#: rhodecode/public/js/scripts.js:39455 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: 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:46116 -#: rhodecode/public/js/scripts.js:37964 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode-components.js:47652 +#: rhodecode/public/js/scripts.js:39456 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Seguir" -#: 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/rhodecode-components.js:48032 +#: rhodecode/public/js/scripts.js:39836 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: 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:46510 -#: rhodecode/public/js/scripts.js:38358 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:48041 +#: rhodecode/public/js/scripts.js:39845 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48046 +#: rhodecode/public/js/scripts.js:39850 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: 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/rhodecode-components.js:48052 +#: rhodecode/public/js/scripts.js:39856 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48068 +#: rhodecode/public/js/scripts.js:39872 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46530 -#: rhodecode/public/js/scripts.js:38378 +#: rhodecode/public/js/rhodecode-components.js:48075 +#: rhodecode/public/js/scripts.js:39879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48082 +#: rhodecode/public/js/scripts.js:39886 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48096 +#: rhodecode/public/js/scripts.js:39900 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48198 +#: rhodecode/public/js/scripts.js:40002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:300 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46823 -#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode-components.js:48204 +#: rhodecode/public/js/scripts.js:40008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +msgid "User `{0}` already in reviewers" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48334 +#: rhodecode/public/js/scripts.js:40138 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:436 msgid "added manually by \"{0}\"" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48338 +#: rhodecode/public/js/scripts.js:40142 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:440 msgid "member of \"{0}\"" msgstr "" -#: 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/rhodecode-components.js:48924 +#: rhodecode/public/js/scripts.js:40728 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: 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/rhodecode-components.js:48944 +#: rhodecode/public/js/scripts.js:40748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: 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 +#: rhodecode/public/js/rhodecode-components.js:49356 +#: rhodecode/public/js/scripts.js:41160 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode.js:574 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 +#: rhodecode/public/js/rhodecode-components.js:49364 +#: rhodecode/public/js/scripts.js:41168 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/src/rhodecode.js:582 msgid "Specified expiration date" msgstr "" @@ -4595,174 +4600,180 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:488 -#: rhodecode/templates/codeblocks/diffs.mako:493 +#: rhodecode/templates/codeblocks/diffs.mako:494 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Add another comment" msgstr "Adicionar outro comentário" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 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/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No branches available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No forks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No gists available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No repositories available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No repository groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 msgid "No ssh keys available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 msgid "No tags available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 msgid "No user groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No users available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: 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 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: 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:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "desabilitado" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "files" msgstr "arquivos" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 msgid "{0} out of {1} ssh keys" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 msgid "{0} years" msgstr "" @@ -4836,12 +4847,17 @@ msgstr "Você tem direitos de administrador neste grupo e pode editá-lo" msgid "Edit Repository Group" msgstr "" -#: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:68 +msgid "No repositories or repositories groups exists here." +msgstr "" + +#: rhodecode/templates/index_base.mako:86 +#: rhodecode/templates/index_base.mako:116 #: rhodecode/templates/admin/gists/index.mako:112 #: 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_user_group_membership.mako:39 #: 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 @@ -4858,13 +4874,14 @@ msgstr "" msgid "Name" msgstr "Nome" -#: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/index_base.mako:89 +#: rhodecode/templates/index_base.mako:119 #: 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/my_account/my_account_user_group_membership.mako:44 #: 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:55 @@ -4894,20 +4911,21 @@ msgstr "Nome" #: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 -#: rhodecode/templates/summary/components.mako:82 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "Descrição" -#: rhodecode/templates/index_base.mako:103 -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:92 +#: rhodecode/templates/index_base.mako:122 #: 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/index_base.mako:94 +#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 @@ -4919,11 +4937,11 @@ msgstr "Última Alteração" #: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:68 -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:209 msgid "Owner" msgstr "Dono" -#: rhodecode/templates/index_base.mako:134 +#: rhodecode/templates/index_base.mako:125 #: 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 @@ -4935,7 +4953,7 @@ msgstr "Dono" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4952,7 +4970,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:341 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:343 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Entrar" @@ -4976,7 +4994,7 @@ msgstr "" #: rhodecode/templates/login.mako:68 #: rhodecode/templates/password_reset.mako:37 -#: rhodecode/templates/base/base.mako:46 +#: rhodecode/templates/base/base.mako:48 #: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "" @@ -5131,7 +5149,7 @@ msgid "Repository" msgstr "Repositório" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:77 msgid "Admin audit logs" msgstr "" @@ -5318,7 +5336,7 @@ 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/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 @@ -5392,7 +5410,7 @@ msgstr "" #: 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:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5495,8 +5513,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: 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:249 +#: rhodecode/templates/base/base.mako:86 +#: rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "Configurações" @@ -5599,7 +5617,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:355 +#: rhodecode/templates/base/base.mako:357 msgid "My account" msgstr "Minha conta" @@ -5627,35 +5645,40 @@ msgstr "" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:36 -msgid "OAuth Identities" +#: rhodecode/templates/admin/my_account/my_account.mako:33 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 +msgid "User Group Membership" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:38 +msgid "OAuth Identities" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "Watched" msgstr "Seguindo" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:43 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 -#: rhodecode/templates/base/base.mako:239 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "Pull Requests" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:44 #: 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 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:82 msgid "Permissions" msgstr "Permissões" -#: rhodecode/templates/admin/my_account/my_account.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:45 msgid "Live Notifications" msgstr "" @@ -5881,6 +5904,23 @@ msgid "" "sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +msgid "Click add to use this generate SSH key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 +#: 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: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 +#: rhodecode/templates/admin/users/users.mako:74 +msgid "Active" +msgstr "Ativo" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" @@ -6094,8 +6134,8 @@ msgstr "Adicionar grupo de repositórios" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:77 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:153 msgid "Repository groups" msgstr "Grupo de repositórios" @@ -6284,7 +6324,7 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:196 +#: rhodecode/templates/base/base.mako:198 msgid "Clone from" msgstr "Clonar de" @@ -6364,7 +6404,7 @@ msgid "Remote" msgstr "Remoto" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:143 +#: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "Estatísticas" @@ -6389,100 +6429,104 @@ msgstr "" msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Attached scoped tokens" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:25 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 msgid "Set" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40 msgid "Manually set this repository as a fork of another from the list" msgstr "Marque manualmente este repositório como uma bifurcação de um outro da lista" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:49 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 msgid "" "All actions made on this repository will be visible to everyone following " "the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "" "Force repository locking. This only works when anonymous access is disabled." " Pulling from the repository locks the repository to that user until the " "same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "Desassociar bifurcações" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "Excluir bifurcações" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 #: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Confirma excluir esse repositório: %s" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 msgid "" "This repository will be renamed in a special way in order to make it " "inaccessible to RhodeCode Enterprise and its VCS systems. If you need to " @@ -6490,11 +6534,11 @@ msgid "" "rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" @@ -6542,17 +6586,6 @@ msgstr "Prefixo" msgid "Key" 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: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 -#: rhodecode/templates/admin/users/users.mako:74 -msgid "Active" -msgstr "Ativo" - #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" @@ -6714,8 +6747,8 @@ msgid "Settings for Repository: %s" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 -msgid "Non-changeable id" -msgstr "ID inalterável" +msgid "permalink id" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" @@ -6909,7 +6942,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:210 +#: rhodecode/templates/admin/settings/settings_visual.mako:214 msgid "Save settings" msgstr "Salvar configurações" @@ -7203,6 +7236,14 @@ msgstr "" msgid "Gunicorn process management" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:11 +msgid "start auto refresh" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:12 +msgid "stop auto refresh" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -7253,13 +7294,6 @@ msgstr "" msgid "Cleanup sessions" msgstr "" -#: rhodecode/templates/admin/settings/settings_supervisor_tail.mako:1 -#, python-format -msgid "" -"Last %(size)s bytes of process logs, use ?offset=[num] GET param to set " -"custom size" -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7415,24 +7449,26 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:170 -msgid "Clone URL" +msgid "Clone URL templates" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:179 +#: rhodecode/templates/admin/settings/settings_visual.mako:181 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" " {user} current user username,\n" +" {sys_user} current system user running this process, usefull for ssh,\n" +" {hostname} hostname of this server running RhodeCode,\n" " {netloc} network location/server host of running RhodeCode server,\n" " {repo} full repository name,\n" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:192 +#: rhodecode/templates/admin/settings/settings_visual.mako:196 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:200 +#: rhodecode/templates/admin/settings/settings_visual.mako:204 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7447,8 +7483,8 @@ msgstr "Adicionar grupo de usuários" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:79 -#: rhodecode/templates/base/base.mako:154 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:156 msgid "User groups" msgstr "Grupos de usuários" @@ -7596,7 +7632,7 @@ msgstr "Adicionar usuário" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:80 msgid "Users" msgstr "Usuários" @@ -7860,13 +7896,17 @@ msgstr "" msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:25 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" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 +msgid "Use this generated key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +msgid "Confirmation required on the next screen" msgstr "" #: rhodecode/templates/admin/users/users.mako:5 @@ -7877,174 +7917,174 @@ msgstr "Administração de usuários" msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:53 +#: rhodecode/templates/base/base.mako:55 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:83 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:83 +#: rhodecode/templates/base/base.mako:85 msgid "Defaults" msgstr "Padrões" -#: rhodecode/templates/base/base.mako:101 +#: rhodecode/templates/base/base.mako:103 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:188 +#: rhodecode/templates/base/base.mako:190 msgid "Fork of" msgstr "Bifurcação de" -#: rhodecode/templates/base/base.mako:205 +#: rhodecode/templates/base/base.mako:207 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:210 +#: rhodecode/templates/base/base.mako:212 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:228 +#: rhodecode/templates/base/base.mako:230 #: 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/base/base.mako:231 #: 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/base/base.mako:232 #: 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:231 +#: rhodecode/templates/base/base.mako:233 #: 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:235 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostrar Pull Requests para %s" -#: rhodecode/templates/base/base.mako:245 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Opções" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: 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/base/base.mako:269 +#: rhodecode/templates/base/base.mako:413 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Pesquisar" -#: rhodecode/templates/base/base.mako:271 +#: rhodecode/templates/base/base.mako:273 msgid "Unlock" msgstr "Destravar" -#: rhodecode/templates/base/base.mako:273 +#: rhodecode/templates/base/base.mako:275 msgid "Lock" msgstr "Travar" -#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/base/base.mako:280 #: 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:279 +#: rhodecode/templates/base/base.mako:281 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:303 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:309 +#: rhodecode/templates/base/base.mako:311 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/base/base.mako:328 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:336 +#: rhodecode/templates/base/base.mako:338 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:338 +#: rhodecode/templates/base/base.mako:340 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:357 +#: rhodecode/templates/base/base.mako:359 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:361 +#: rhodecode/templates/base/base.mako:363 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:393 +#: rhodecode/templates/base/base.mako:395 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:396 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:15 msgid "Journal" msgstr "Diário" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:401 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:402 msgid "Public journal" msgstr "Diário público" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:407 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:408 msgid "Gists" msgstr "Gists" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:412 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/base/base.mako:418 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:433 -#: rhodecode/templates/base/base.mako:434 +#: rhodecode/templates/base/base.mako:435 +#: rhodecode/templates/base/base.mako:436 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8066,15 +8106,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:491 +#: rhodecode/templates/base/base.mako:493 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:546 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:554 msgid "Site-wide shortcuts" msgstr "" @@ -8181,8 +8221,8 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:274 -#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:325 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8527,10 +8567,10 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changelog/changelog_elements.mako:121 #: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 -#: rhodecode/templates/summary/summary_commits.mako:62 +#: rhodecode/templates/summary/summary_commits.mako:68 #, python-format msgid "Bookmark %s" msgstr "Bookmark %s" @@ -8549,10 +8589,10 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changelog/changelog_elements.mako:113 #: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 -#: rhodecode/templates/summary/summary_commits.mako:76 +#: rhodecode/templates/summary/summary_commits.mako:82 #, python-format msgid "Branch %s" msgstr "Ramo %s" @@ -8617,79 +8657,79 @@ msgstr "Ainda não há alteações" msgid "load previous" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/summary/summary_commits.mako:21 +#: rhodecode/templates/changelog/changelog_elements.mako:32 +#: rhodecode/templates/summary/summary_commits.mako:27 #, python-format msgid "" "Commit status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/summary/summary_commits.mako:25 +#: rhodecode/templates/changelog/changelog_elements.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: {}" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/summary/summary_commits.mako:31 +#: rhodecode/templates/changelog/changelog_elements.mako:42 +#: rhodecode/templates/summary/summary_commits.mako:37 msgid "Commit status: Not Reviewed" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/summary/summary_commits.mako:36 +#: rhodecode/templates/changelog/changelog_elements.mako:47 +#: rhodecode/templates/summary/summary_commits.mako:42 msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changelog/changelog_elements.mako:58 #: rhodecode/templates/changeset/changeset.mako:42 msgid "Copy the full commit id" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changelog/changelog_elements.mako:65 #: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:72 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: rhodecode/templates/changeset/changeset.mako:50 #: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:72 #: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: 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/changelog/changelog_elements.mako:83 +#: rhodecode/templates/compare/compare_commits.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changelog/changelog_elements.mako:107 #: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "mesclar" -#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 -#: rhodecode/templates/summary/summary_commits.mako:69 +#: rhodecode/templates/summary/summary_commits.mako:75 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "Tag %s" -#: rhodecode/templates/changelog/changelog_elements.mako:137 +#: rhodecode/templates/changelog/changelog_elements.mako:143 msgid "load next" msgstr "" @@ -8724,7 +8764,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:81 +#: rhodecode/templates/changeset/changeset_file_comment.mako:82 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8740,8 +8780,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:445 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:451 +#: rhodecode/templates/codeblocks/diffs.mako:454 msgid "Raw diff" msgstr "Diff cru" @@ -8758,8 +8798,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:452 -#: rhodecode/templates/codeblocks/diffs.mako:455 +#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:461 msgid "Download diff" msgstr "Baixar diff" @@ -8783,103 +8823,103 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:32 +#: rhodecode/templates/changeset/changeset_file_comment.mako:33 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:39 +#: rhodecode/templates/changeset/changeset_file_comment.mako:40 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:66 -#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:67 +#: rhodecode/templates/changeset/changeset_file_comment.mako:69 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:73 +#: rhodecode/templates/changeset/changeset_file_comment.mako:74 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:88 +#: rhodecode/templates/changeset/changeset_file_comment.mako:89 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 msgid "Pull request author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +#: rhodecode/templates/changeset/changeset_file_comment.mako:98 msgid "author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:105 +#: rhodecode/templates/changeset/changeset_file_comment.mako:106 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:109 -#: rhodecode/templates/changeset/changeset_file_comment.mako:124 +#: rhodecode/templates/changeset/changeset_file_comment.mako:110 +#: rhodecode/templates/changeset/changeset_file_comment.mako:125 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:121 +#: rhodecode/templates/changeset/changeset_file_comment.mako:122 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:151 -#: rhodecode/templates/changeset/changeset_file_comment.mako:154 -msgid "Prev" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:152 #: rhodecode/templates/changeset/changeset_file_comment.mako:155 +msgid "Prev" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:153 +#: rhodecode/templates/changeset/changeset_file_comment.mako:156 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:191 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:193 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:195 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: 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:65 +msgid "You need to be logged in to leave comments." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Entrar agora" -#: rhodecode/templates/changeset/changeset_file_comment.mako:348 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "" "Use @username inside this text to send notification to this RhodeCode user" msgstr "Use @nomedeusuário dentro desse texto para enviar notificação a este usuário do RhodeCode" -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 +#: rhodecode/templates/changeset/changeset_file_comment.mako:352 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:368 +#: rhodecode/templates/changeset/changeset_file_comment.mako:369 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Fechado" -#: rhodecode/templates/changeset/changeset_file_comment.mako:398 +#: rhodecode/templates/changeset/changeset_file_comment.mako:399 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8976,71 +9016,71 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:290 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/codeblocks/diffs.mako:356 #: 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 +#: rhodecode/templates/codeblocks/diffs.mako:421 +#: rhodecode/templates/codeblocks/diffs.mako:437 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:417 -#: rhodecode/templates/codeblocks/diffs.mako:424 +#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:430 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:422 -#: rhodecode/templates/codeblocks/diffs.mako:438 +#: rhodecode/templates/codeblocks/diffs.mako:428 +#: rhodecode/templates/codeblocks/diffs.mako:444 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:433 -#: rhodecode/templates/codeblocks/diffs.mako:440 +#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:446 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:643 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:651 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:649 +#: rhodecode/templates/codeblocks/diffs.mako:655 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:650 +#: rhodecode/templates/codeblocks/diffs.mako:656 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:660 +#: rhodecode/templates/codeblocks/diffs.mako:666 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:664 +#: rhodecode/templates/codeblocks/diffs.mako:670 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:668 +#: rhodecode/templates/codeblocks/diffs.mako:674 msgid "Wide Mode Diff" msgstr "" @@ -9057,11 +9097,11 @@ msgid "Compare was calculated based on this shared commit." msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:78 msgid "No commits in this compare" msgstr "" @@ -9632,7 +9672,7 @@ msgid "Close File List" msgstr "" #: rhodecode/templates/files/files_browser.mako:25 -#: rhodecode/templates/summary/summary_commits.mako:103 +#: rhodecode/templates/summary/summary_commits.mako:109 msgid "Add New File" msgstr "" @@ -9908,12 +9948,12 @@ msgid "Pull request reviewers" msgstr "Revisores do pull request" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 msgid "Add reviewer or reviewer group" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:504 +#: rhodecode/templates/pullrequests/pullrequest.mako:508 msgid "Please select source and target" msgstr "" @@ -9921,19 +9961,19 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:364 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:368 +#: rhodecode/templates/pullrequests/pullrequest.mako:371 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:431 +#: rhodecode/templates/pullrequests/pullrequest.mako:435 msgid "Target repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:441 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Select commit reference" msgstr "" @@ -9994,8 +10034,7 @@ msgid "Merge" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:140 -#: rhodecode/templates/summary/components.mako:53 -#: rhodecode/templates/summary/components.mako:69 +#: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" @@ -10075,85 +10114,81 @@ msgid "Pull request versions not available" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 -msgid "Mandatory reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 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:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 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:431 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 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:442 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 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:482 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:593 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:596 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 msgid "show them" msgstr "" @@ -10264,74 +10299,59 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/components.mako:49 -msgid "Read-only url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -#: rhodecode/templates/summary/components.mako:72 +#: rhodecode/templates/summary/components.mako:71 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:76 +msgid "Copy the clone by ssh url" +msgstr "" -#: 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 +#: rhodecode/templates/summary/components.mako:80 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:65 -msgid "Clone url" -msgstr "URL de clonagem" - -#: rhodecode/templates/summary/components.mako:94 +#: rhodecode/templates/summary/components.mako:100 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:110 +#: rhodecode/templates/summary/components.mako:116 msgid "Number of Repository Forks" msgstr "" -#: rhodecode/templates/summary/components.mako:118 +#: rhodecode/templates/summary/components.mako:124 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:149 +#: rhodecode/templates/summary/components.mako:155 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:153 +#: rhodecode/templates/summary/components.mako:159 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" -#: rhodecode/templates/summary/components.mako:156 +#: rhodecode/templates/summary/components.mako:162 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:167 +#: rhodecode/templates/summary/components.mako:173 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:173 +#: rhodecode/templates/summary/components.mako:179 msgid "There are no downloads yet" msgstr "Ainda não há downloads" -#: rhodecode/templates/summary/components.mako:177 +#: rhodecode/templates/summary/components.mako:183 msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: rhodecode/templates/summary/components.mako:180 +#: rhodecode/templates/summary/components.mako:186 msgid "enable downloads" msgstr "" @@ -10364,15 +10384,15 @@ msgstr "%s ATOM feed" msgid "%s RSS feed" msgstr "%s RSS feed" -#: rhodecode/templates/summary/summary_commits.mako:100 +#: rhodecode/templates/summary/summary_commits.mako:106 msgid "Add or upload files directly via RhodeCode:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:111 +#: rhodecode/templates/summary/summary_commits.mako:117 msgid "Push new repo:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:128 msgid "Existing repository?" msgstr "Repositório existente?" @@ -10400,9 +10420,3 @@ msgstr "" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" msgstr "" - -#: rhodecode/tests/lib/test_ext_json.py:163 -msgid "singular" -msgid_plural "plural" -msgstr[0] "" -msgstr[1] "" diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot index efd72b77..6a8ae14f 100644 --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rhodecode-enterprise-ce 4.11.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"POT-Creation-Date: 2018-01-30 18:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,25 +17,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: rhodecode/apps/_base/__init__.py:142 -#, python-format -msgid "Error creating repository %s: invalid certificate" -msgstr "" - -#: rhodecode/apps/_base/__init__.py:146 -#, python-format -msgid "Error creating repository %s" -msgstr "" - -#: rhodecode/apps/_base/__init__.py:219 -#, python-format -msgid "The repository `%(repo_name)s` cannot be loaded in filesystem. Please check if it exist, or is not damaged." -msgstr "" - -#: rhodecode/apps/_base/__init__.py:274 -msgid "Editing user `{}` is disabled." -msgstr "" - #: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 diff --git a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo index ace1ca02..cfacc85d 100644 Binary files a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo and b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo differ diff --git a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po index 0d91317a..5f532eaf 100644 --- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po @@ -1,5 +1,5 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2017 RhodeCode GmbH +# Copyright (C) 2018 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-11-03 16:42+0100\n" -"PO-Revision-Date: 2017-11-03 15:43+0000\n" +"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"PO-Revision-Date: 2018-01-30 16:33+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Russian (http://www.transifex.com/rhodecode/RhodeCode/language/ru/)\n" "MIME-Version: 1.0\n" @@ -38,32 +38,53 @@ msgstr "" "Language: ru\n" "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/apps/_base/__init__.py:142 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "" + +#: rhodecode/apps/_base/__init__.py:146 +#, python-format +msgid "Error creating repository %s" +msgstr "Произошла ошибка при создании репозитория %s" + +#: rhodecode/apps/_base/__init__.py:219 +#, python-format +msgid "" +"The repository `%(repo_name)s` cannot be loaded in filesystem. Please check " +"if it exist, or is not damaged." +msgstr "" + +#: rhodecode/apps/_base/__init__.py:274 +msgid "Editing user `{}` is disabled." +msgstr "" + +#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/apps/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:74 #: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "" -#: rhodecode/apps/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:76 msgid "Visual" msgstr "" -#: rhodecode/apps/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:78 msgid "Remap and Rescan" msgstr "" -#: rhodecode/apps/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:80 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "" -#: rhodecode/apps/admin/navigation.py:89 -#: rhodecode/integrations/types/email.py:232 +#: rhodecode/apps/admin/navigation.py:82 +#: rhodecode/integrations/types/email.py:233 #: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 @@ -75,15 +96,15 @@ msgstr "" msgid "Email" msgstr "E-mail" -#: rhodecode/apps/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:84 msgid "Hooks" msgstr "Хуки" -#: rhodecode/apps/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:86 msgid "Full Text Search" msgstr "" -#: rhodecode/apps/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:88 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -97,28 +118,28 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 #: rhodecode/templates/admin/repos/repo_edit.mako:75 -#: rhodecode/templates/base/base.mako:82 +#: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "" -#: rhodecode/apps/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:90 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "" -#: rhodecode/apps/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:92 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:94 msgid "User Sessions" msgstr "" -#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/apps/admin/navigation.py:96 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:109 +#: rhodecode/apps/admin/navigation.py:101 msgid "Labs" msgstr "" @@ -130,13 +151,13 @@ msgstr "Стандартные настройки успешно обновле msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:121 +#: rhodecode/apps/admin/views/permissions.py:120 msgid "Application permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:141 #: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:287 +#: rhodecode/apps/admin/views/permissions.py:288 msgid "Error occurred during update of permissions" msgstr "Произошла ошибка во время обновления привилегий" @@ -144,11 +165,11 @@ msgstr "Произошла ошибка во время обновления п msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:267 +#: rhodecode/apps/admin/views/permissions.py:268 msgid "Global permissions updated successfully" msgstr "Глобальные привилегии успешно обновлены" -#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/apps/admin/views/permissions.py:450 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:208 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -169,20 +190,20 @@ msgstr "Глобальные привилегии успешно обновле msgid "Edit" msgstr "Редактировать" -#: rhodecode/apps/admin/views/permissions.py:476 +#: rhodecode/apps/admin/views/permissions.py:478 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:479 +#: rhodecode/apps/admin/views/permissions.py:481 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:180 +#: rhodecode/apps/admin/views/repo_groups.py:181 #, python-format msgid "Created repository group %s" msgstr "Создана новая группа репозиториев %s" -#: rhodecode/apps/admin/views/repo_groups.py:198 +#: rhodecode/apps/admin/views/repo_groups.py:199 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Произошла ошибка при создании группы репозиториев %s" @@ -191,10 +212,86 @@ msgstr "Произошла ошибка при создании группы р msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/apps/admin/views/sessions.py:98 +#: rhodecode/apps/admin/views/sessions.py:97 msgid "Failed to cleanup up old sessions" msgstr "" +#: rhodecode/apps/admin/views/settings.py:162 +#: rhodecode/apps/admin/views/settings.py:708 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:351 +msgid "Error occurred during updating application settings" +msgstr "Произошла ошибка при обновлении настроек приложения" + +#: rhodecode/apps/admin/views/settings.py:194 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +msgid "Updated VCS settings" +msgstr "Обновлены настройки VCS" + +#: rhodecode/apps/admin/views/settings.py:268 +#, python-format +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "Репозитории успешно пересканированы, добавлено: %s ; удалено: %s" + +#: rhodecode/apps/admin/views/settings.py:347 +msgid "Updated application settings" +msgstr "Обновленные параметры настройки приложения" + +#: rhodecode/apps/admin/views/settings.py:426 +msgid "Updated visualisation settings" +msgstr "Настройки визуализации обновлены" + +#: rhodecode/apps/admin/views/settings.py:429 +msgid "Error occurred during updating visualisation settings" +msgstr "Произошла ошибка при обновлении настроек визуализации" + +#: rhodecode/apps/admin/views/settings.py:491 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +msgid "Invalid issue tracker pattern: {}" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:508 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:526 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:563 +msgid "Please enter email address" +msgstr "Пожалуйста, введите адрес электронной почты" + +#: rhodecode/apps/admin/views/settings.py:581 +msgid "Send email task created" +msgstr "Задача отправки Email создана" + +#: rhodecode/apps/admin/views/settings.py:631 +msgid "Added new hook" +msgstr "Добавлена новая ловушка" + +#: rhodecode/apps/admin/views/settings.py:646 +msgid "Updated hooks" +msgstr "Обновлённые ловушки" + +#: rhodecode/apps/admin/views/settings.py:650 +msgid "Error occurred during hook creation" +msgstr "Произошла ошибка при создании хука" + +#: rhodecode/apps/admin/views/settings.py:732 +msgid "Error occurred during updating labs settings" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:737 +msgid "Updated Labs settings" +msgstr "" + #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" @@ -203,149 +300,153 @@ msgstr "" msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/apps/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:79 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:102 +#: rhodecode/apps/admin/views/system_info.py:90 msgid "Update info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:104 +#: rhodecode/apps/admin/views/system_info.py:92 msgid "Check for updates" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:97 msgid "RhodeCode Version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:110 +#: rhodecode/apps/admin/views/system_info.py:98 +msgid "Latest version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:99 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:111 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:112 +#: rhodecode/apps/admin/views/system_info.py:101 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "RhodeCode Certificate" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:103 msgid "Workers" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:115 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Worker Type" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "Database" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:109 msgid "Database version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:124 +#: rhodecode/apps/admin/views/system_info.py:113 msgid "Platform" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Platform UUID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Python version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:116 msgid "Python path" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:131 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "CPU" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Load" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Memory" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:123 msgid "Uptime" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Storage inodes" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "Gist storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Gist storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Archive cache storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:148 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Temp storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:149 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Temp storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Search info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Search location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:156 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "VCS Backends" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:157 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "VCS Server" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:158 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "GIT" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:159 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "HG" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:160 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "SVN" msgstr "" @@ -359,188 +460,188 @@ msgstr "" msgid "Error occurred during creation of user group %s" msgstr "Произошла ошибка при создании группы пользователей %s" -#: rhodecode/apps/admin/views/users.py:208 +#: rhodecode/apps/admin/views/users.py:209 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/apps/admin/views/users.py:229 +#: rhodecode/apps/admin/views/users.py:230 #, python-format msgid "Error occurred during creation of user %s" msgstr "Произошла ошибка при создании пользователя %s" -#: rhodecode/apps/admin/views/users.py:303 +#: rhodecode/apps/admin/views/users.py:304 msgid "User updated successfully" msgstr "Пользователь успешно обновлён" -#: rhodecode/apps/admin/views/users.py:321 -#: rhodecode/apps/my_account/views/my_account.py:485 +#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/my_account/views/my_account.py:490 #, python-format msgid "Error occurred during update of user %s" msgstr "Произошла ошибка при обновлении пользователя %s" -#: rhodecode/apps/admin/views/users.py:353 +#: rhodecode/apps/admin/views/users.py:354 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:358 +#: rhodecode/apps/admin/views/users.py:359 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:366 +#: rhodecode/apps/admin/views/users.py:367 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:371 +#: rhodecode/apps/admin/views/users.py:372 #, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:379 +#: rhodecode/apps/admin/views/users.py:380 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:384 +#: rhodecode/apps/admin/views/users.py:385 #, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:401 +#: rhodecode/apps/admin/views/users.py:402 msgid "Successfully deleted user" msgstr "Пользователь успешно удалён" -#: rhodecode/apps/admin/views/users.py:407 +#: rhodecode/apps/admin/views/users.py:408 msgid "An error occurred during deletion of user" msgstr "Произошла ошибка при удалении пользователя" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:473 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 +#: rhodecode/apps/admin/views/users.py:479 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 +#: rhodecode/apps/admin/views/users.py:567 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:583 -#: rhodecode/apps/user_group/views/__init__.py:472 +#: rhodecode/apps/admin/views/users.py:585 +#: rhodecode/apps/user_group/views/__init__.py:448 msgid "An error occurred during permissions saving" msgstr "Произошла ошибка при сохранении привилегий" -#: rhodecode/apps/admin/views/users.py:608 +#: rhodecode/apps/admin/views/users.py:610 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:613 +#: rhodecode/apps/admin/views/users.py:615 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:622 +#: rhodecode/apps/admin/views/users.py:624 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:661 +#: rhodecode/apps/admin/views/users.py:663 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:667 +#: rhodecode/apps/admin/views/users.py:669 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/apps/admin/views/users.py:671 +#: rhodecode/apps/admin/views/users.py:673 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:676 +#: rhodecode/apps/admin/views/users.py:678 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/apps/admin/views/users.py:701 +#: rhodecode/apps/my_account/views/my_account.py:160 #: 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:737 -#: rhodecode/apps/my_account/views/my_account.py:193 +#: rhodecode/apps/admin/views/users.py:739 +#: rhodecode/apps/my_account/views/my_account.py:194 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:766 -#: rhodecode/apps/my_account/views/my_account.py:217 +#: rhodecode/apps/admin/views/users.py:768 +#: rhodecode/apps/my_account/views/my_account.py:218 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/admin/views/users.py:840 #: 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/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:849 #: 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/admin/views/users.py:883 #: 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 +#: rhodecode/apps/admin/views/users.py:929 +#: rhodecode/apps/my_account/views/my_account.py:260 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:928 +#: rhodecode/apps/admin/views/users.py:935 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 +#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/my_account/views/my_account.py:266 msgid "An error occurred during email saving" msgstr "Произошла ошибка при сохранении E-mail" -#: rhodecode/apps/admin/views/users.py:959 +#: rhodecode/apps/admin/views/users.py:966 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1005 +#: rhodecode/apps/admin/views/users.py:1012 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1023 +#: rhodecode/apps/admin/views/users.py:1034 msgid "An error occurred during ip saving" msgstr "Произошла ошибка при сохранении IP" -#: rhodecode/apps/admin/views/users.py:1027 +#: rhodecode/apps/admin/views/users.py:1038 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1057 +#: rhodecode/apps/admin/views/users.py:1068 msgid "Removed ip address from user whitelist" msgstr "IP %s удален из белого списка пользователя" -#: rhodecode/apps/admin/views/users.py:1122 +#: rhodecode/apps/admin/views/users.py:1133 msgid "Groups successfully changed" msgstr "" @@ -565,10 +666,10 @@ 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 +#: rhodecode/public/js/rhodecode-components.js:49320 +#: rhodecode/public/js/scripts.js:41124 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/src/rhodecode.js:538 msgid "Lifetime" msgstr "Срок" @@ -619,75 +720,75 @@ msgstr "" 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/apps/home/views.py:218 rhodecode/apps/home/views.py:251 +#: rhodecode/apps/repository/views/repo_pull_requests.py:719 +#: rhodecode/templates/admin/my_account/my_account.mako:41 #: 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:580 +#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:150 +#: rhodecode/templates/base/base.mako:582 msgid "Repositories" msgstr "Репозитории" -#: rhodecode/apps/home/views.py:241 +#: rhodecode/apps/home/views.py:244 msgid "Groups" msgstr "Группы" -#: rhodecode/apps/home/views.py:261 +#: rhodecode/apps/home/views.py:264 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "общедоступный журнал" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 msgid "journal" msgstr "журнал" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:281 +#: rhodecode/apps/login/views.py:288 msgid "You have successfully registered with RhodeCode" msgstr "Регистрация в RhodeCode прошла успешно" -#: rhodecode/apps/login/views.py:317 +#: rhodecode/apps/login/views.py:325 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:323 +#: rhodecode/apps/login/views.py:331 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:412 +#: rhodecode/apps/login/views.py:420 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:428 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "Сброс пароля прошел успешно, новый пароль отправлен на ваш адрес электронной почты" -#: rhodecode/apps/my_account/views/my_account.py:134 +#: rhodecode/apps/my_account/views/my_account.py:135 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:141 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:288 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:465 +#: rhodecode/apps/my_account/views/my_account.py:470 msgid "Your account was updated successfully" msgstr "Ваша учетная запись успешно обновлена" @@ -702,7 +803,7 @@ 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 +#: rhodecode/apps/user_group/views/__init__.py:328 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -729,28 +830,28 @@ msgstr "Произошла ошибка при очистке кэша" #: 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:585 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_commits.py:192 #: 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 +#: rhodecode/apps/repository/views/repo_checks.py:98 #, python-format msgid "Created repository %s from %s" msgstr "Репозиторий %s создан из %s" -#: rhodecode/apps/repository/views/repo_checks.py:104 +#: rhodecode/apps/repository/views/repo_checks.py:107 #, python-format msgid "Forked repository %s as %s" msgstr "Сделан форк(копия) репозитория %s на %s" -#: rhodecode/apps/repository/views/repo_checks.py:107 +#: rhodecode/apps/repository/views/repo_checks.py:110 #, python-format msgid "Created repository %s" msgstr "Репозиторий %s создан" @@ -779,13 +880,13 @@ msgstr "Выделять несовпадения увеличением тек msgid "Increase context for all diffs" msgstr "Всегда выделять несовпадения увеличением текста при сравнении файлов" -#: rhodecode/apps/repository/views/repo_commits.py:389 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#: rhodecode/apps/repository/views/repo_commits.py:388 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1129 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "Изменить статус %(transition_icon)s %(status)s" -#: rhodecode/apps/repository/views/repo_commits.py:433 +#: rhodecode/apps/repository/views/repo_commits.py:432 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -867,14 +968,14 @@ 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/apps/repository/views/repo_summary.py:322 +#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 #: 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 +#: rhodecode/model/scm.py:804 rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "Метки" @@ -935,12 +1036,12 @@ msgid "" "the path" msgstr "Указанное расположение должно быть релятивным и не должно содержать \"..\" в имени пути" -#: rhodecode/apps/repository/views/repo_forks.py:144 -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "Сравнить форк" -#: rhodecode/apps/repository/views/repo_forks.py:250 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "Произошла ошибка во время создания форка репозитория %s" @@ -949,91 +1050,88 @@ msgstr "Произошла ошибка во время создания фор msgid "Repository permissions updated" msgstr "Привилегии репозитория обновлены" -#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +#: rhodecode/apps/repository/views/repo_pull_requests.py:615 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:750 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +#: rhodecode/apps/repository/views/repo_pull_requests.py:775 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +#: rhodecode/apps/repository/views/repo_pull_requests.py:790 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +#: rhodecode/apps/repository/views/repo_pull_requests.py:841 msgid "Successfully opened new pull request" msgstr "Pull запрос создан успешно" -#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +#: rhodecode/apps/repository/views/repo_pull_requests.py:844 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +#: rhodecode/apps/repository/views/repo_pull_requests.py:875 +#: rhodecode/apps/repository/views/repo_pull_requests.py:905 msgid "Cannot update closed pull requests." msgstr "Не могу обновить закрытые запросы на включение изменений." -#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +#: rhodecode/apps/repository/views/repo_pull_requests.py:911 msgid "Pull request title & description updated." msgstr "Заголовок и описание запроса на включение изменений обновлены." -#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:946 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1010 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1034 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1060 msgid "Successfully deleted pull request" msgstr "Pull запрос успешно удалён" -#: rhodecode/apps/repository/views/repo_settings.py:167 +#: rhodecode/apps/repository/views/repo_settings.py:168 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:193 +#: rhodecode/apps/repository/views/repo_settings.py:194 msgid "Unlocked" msgstr "Разблокировано" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:199 msgid "Locked" msgstr "Заблокировано" -#: rhodecode/apps/repository/views/repo_settings.py:200 +#: rhodecode/apps/repository/views/repo_settings.py:201 #, python-format msgid "Repository has been %s" msgstr "Репозиторий %s" -#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings.py:205 #: rhodecode/apps/repository/views/repo_settings_advanced.py:230 msgid "An error occurred during unlocking" msgstr "Произошла ошибка во время разблокирования" -#: rhodecode/apps/repository/views/repo_settings.py:248 +#: rhodecode/apps/repository/views/repo_settings.py:249 msgid "An error occurred during deletion of repository stats" msgstr "Произошла ошибка при удалении статистики репозитория" @@ -1096,28 +1194,18 @@ msgstr "Закрытый репозиторий" msgid "Unlocked repository" msgstr "Открытый репозиторий" -#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +#: rhodecode/apps/repository/views/repo_settings_fields.py:86 msgid "An error occurred during creation of field" msgstr "Произошла ошибка при создании поля" -#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +#: rhodecode/apps/repository/views/repo_settings_fields.py:108 msgid "An error occurred during removal of field" msgstr "Произошла ошибка при удалении поля" -#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86 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 "Внесены изменения из удалённого репозитория" @@ -1126,34 +1214,23 @@ msgstr "Внесены изменения из удалённого репози 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 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Branch" msgstr "Ветка" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Tag" msgstr "Тэги" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:299 msgid "Bookmark" msgstr "Закладки" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:323 msgid "Closed branches" msgstr "" @@ -1165,41 +1242,41 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:209 +#: rhodecode/apps/user_group/views/__init__.py:184 #, python-format msgid "Updated user group %s" msgstr "Группа пользователей %s обновлена" -#: rhodecode/apps/user_group/views/__init__.py:231 +#: rhodecode/apps/user_group/views/__init__.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "Произошла ошибка при обновлении группы пользователей %s" -#: rhodecode/apps/user_group/views/__init__.py:257 +#: rhodecode/apps/user_group/views/__init__.py:232 msgid "Successfully deleted user group" msgstr "Группа пользователей успешно удалена" -#: rhodecode/apps/user_group/views/__init__.py:262 +#: rhodecode/apps/user_group/views/__init__.py:237 msgid "An error occurred during deletion of user group" msgstr "Произошла ошибка при удалении группы пользователей" -#: rhodecode/apps/user_group/views/__init__.py:366 +#: rhodecode/apps/user_group/views/__init__.py:341 msgid "Target group cannot be the same" msgstr "Целевая группа не может быть такой же" -#: rhodecode/apps/user_group/views/__init__.py:381 +#: rhodecode/apps/user_group/views/__init__.py:356 msgid "User Group permissions updated" msgstr "Привилегии группы пользователей обновлены" -#: rhodecode/apps/user_group/views/__init__.py:452 +#: rhodecode/apps/user_group/views/__init__.py:428 msgid "User Group global permissions updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:534 +#: rhodecode/apps/user_group/views/__init__.py:510 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:538 +#: rhodecode/apps/user_group/views/__init__.py:514 msgid "An error occurred during synchronization update" msgstr "" @@ -1226,20 +1303,20 @@ msgstr "" msgid "Auth Cache TTL" msgstr "" -#: rhodecode/authentication/views.py:90 +#: rhodecode/authentication/views.py:93 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:170 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:181 +#: rhodecode/authentication/views.py:173 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:191 +#: rhodecode/authentication/views.py:181 msgid "Error occurred during update of auth settings." msgstr "" @@ -1364,11 +1441,11 @@ msgid "Password to authenticate for given user DN." msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 -#: rhodecode/integrations/types/webhook.py:214 +#: rhodecode/integrations/types/webhook.py:220 #: 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:324 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "Пароль" @@ -1492,56 +1569,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:286 -msgid "Error occurred during updating application settings" -msgstr "Произошла ошибка при обновлении настроек приложения" - -#: rhodecode/controllers/admin/settings.py:226 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "Репозитории успешно пересканированы, добавлено: %s ; удалено: %s" - -#: rhodecode/controllers/admin/settings.py:282 -msgid "Updated application settings" -msgstr "Обновленные параметры настройки приложения" - -#: rhodecode/controllers/admin/settings.py:348 -msgid "Updated visualisation settings" -msgstr "Настройки визуализации обновлены" - -#: rhodecode/controllers/admin/settings.py:351 -msgid "Error occurred during updating visualisation settings" -msgstr "Произошла ошибка при обновлении настроек визуализации" - -#: rhodecode/controllers/admin/settings.py:444 -msgid "Please enter email address" -msgstr "Пожалуйста, введите адрес электронной почты" - -#: rhodecode/controllers/admin/settings.py:462 -msgid "Send email task created" -msgstr "Задача отправки Email создана" - -#: rhodecode/controllers/admin/settings.py:495 -msgid "Added new hook" -msgstr "Добавлена новая ловушка" - -#: rhodecode/controllers/admin/settings.py:510 -msgid "Updated hooks" -msgstr "Обновлённые ловушки" - -#: rhodecode/controllers/admin/settings.py:514 -msgid "Error occurred during hook creation" -msgstr "Произошла ошибка при создании хука" - -#: rhodecode/controllers/admin/settings.py:643 -msgid "Error occurred during updating labs settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:648 -msgid "Updated Labs settings" -msgstr "" - #: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" @@ -1566,35 +1593,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:149 +#: rhodecode/events/repo.py:189 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:158 +#: rhodecode/events/repo.py:198 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:167 +#: rhodecode/events/repo.py:207 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:176 +#: rhodecode/events/repo.py:216 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:256 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:265 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:274 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:285 msgid "repository push" msgstr "" @@ -1645,7 +1672,7 @@ msgstr "" #: 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:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:215 #: 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 @@ -1673,9 +1700,9 @@ msgstr "Сброс" #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: 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/changeset/changeset_file_comment.mako:143 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:148 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1738,81 +1765,81 @@ msgstr "" msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:302 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:327 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:214 +#: rhodecode/integrations/types/email.py:215 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:215 +#: rhodecode/integrations/types/email.py:216 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:220 #: rhodecode/integrations/types/email.py:221 +#: rhodecode/integrations/types/email.py:222 msgid "Email address" msgstr "Адрес E-mail" -#: rhodecode/integrations/types/email.py:233 +#: rhodecode/integrations/types/email.py:234 msgid "Send repo push summaries to a list of recipients via email" msgstr "" -#: rhodecode/integrations/types/hipchat.py:43 +#: rhodecode/integrations/types/hipchat.py:41 msgid "Yellow" msgstr "" -#: rhodecode/integrations/types/hipchat.py:44 +#: rhodecode/integrations/types/hipchat.py:42 msgid "Red" msgstr "" -#: rhodecode/integrations/types/hipchat.py:45 +#: rhodecode/integrations/types/hipchat.py:43 msgid "Green" msgstr "" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Purple" msgstr "" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Gray" msgstr "" -#: rhodecode/integrations/types/hipchat.py:52 +#: rhodecode/integrations/types/hipchat.py:50 msgid "Hipchat server URL" msgstr "" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:51 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:63 +#: rhodecode/integrations/types/hipchat.py:61 msgid "Notify" msgstr "" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:62 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:70 +#: rhodecode/integrations/types/hipchat.py:68 msgid "Color" msgstr "" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:69 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:99 +#: rhodecode/integrations/types/hipchat.py:97 msgid "Hipchat" msgstr "" -#: rhodecode/integrations/types/hipchat.py:100 +#: rhodecode/integrations/types/hipchat.py:98 msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" @@ -1828,7 +1855,7 @@ msgid "" msgstr "" #: rhodecode/integrations/types/slack.py:60 -#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/integrations/types/webhook.py:210 #: 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 @@ -1839,7 +1866,7 @@ msgstr "" #: 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:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1875,11 +1902,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:177 +#: rhodecode/integrations/types/webhook.py:183 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:185 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 " @@ -1887,53 +1914,53 @@ msgid "" "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:199 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:194 +#: rhodecode/integrations/types/webhook.py:200 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 +#: rhodecode/integrations/types/webhook.py:211 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:215 +#: rhodecode/integrations/types/webhook.py:221 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:225 +#: rhodecode/integrations/types/webhook.py:231 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:226 +#: rhodecode/integrations/types/webhook.py:232 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:235 +#: rhodecode/integrations/types/webhook.py:241 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:236 +#: rhodecode/integrations/types/webhook.py:242 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:245 +#: rhodecode/integrations/types/webhook.py:251 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:246 +#: rhodecode/integrations/types/webhook.py:252 msgid "Select if the Webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:259 +#: rhodecode/integrations/types/webhook.py:265 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:260 +#: rhodecode/integrations/types/webhook.py:266 msgid "Post json events to a Webhook endpoint" msgstr "" @@ -2021,80 +2048,63 @@ msgstr "[добавлен в наблюдения] репозиторий" msgid "[stopped following] repository" msgstr "[удалён из наблюдения] репозиторий" -#: rhodecode/lib/action_parser.py:171 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "имя форка %s" -#: rhodecode/lib/action_parser.py:189 +#: rhodecode/lib/action_parser.py:191 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "Pull запрос #%s" -#: rhodecode/lib/action_parser.py:223 +#: rhodecode/lib/action_parser.py:226 #, python-format msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:228 +#: rhodecode/lib/action_parser.py:231 msgid "compare view" msgstr "сравнение" -#: rhodecode/lib/action_parser.py:235 +#: rhodecode/lib/action_parser.py:238 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:288 +#: rhodecode/lib/action_parser.py:293 #, python-format msgid "Deleted branch: %s" msgstr "Удалена ветка: %s" -#: rhodecode/lib/action_parser.py:291 +#: rhodecode/lib/action_parser.py:296 #, python-format msgid "Created tag: %s" msgstr "Создан тег: %s" -#: rhodecode/lib/action_parser.py:304 +#: rhodecode/lib/action_parser.py:309 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1445 +#: rhodecode/lib/auth.py:1441 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблокирован" -#: rhodecode/lib/auth.py:1535 +#: rhodecode/lib/auth.py:1531 msgid "You need to be a registered user to perform this action" msgstr "Вы должны быть зарегистрированным пользователем, чтобы выполнить это действие" -#: rhodecode/lib/auth.py:1577 +#: rhodecode/lib/auth.py:1575 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:62 -msgid "Click to comment" -msgstr "" - -#: rhodecode/lib/diffs.py:77 -msgid "Binary file" -msgstr "Двоичный файл" - -#: rhodecode/lib/diffs.py:98 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Набор изменения оказался слишком большими и был урезан, используйте меню сравнения для показа результата сравнения" - -#: rhodecode/lib/diffs.py:109 -msgid "No changes detected" -msgstr "Изменений не обнаружено" - -#: rhodecode/lib/diffs.py:927 +#: rhodecode/lib/diffs.py:864 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1869 +#: rhodecode/lib/helpers.py:1855 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2114,7 +2124,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1893 +#: rhodecode/lib/helpers.py:1879 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2128,49 +2138,49 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1910 +#: rhodecode/lib/helpers.py:1896 #, 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:525 +#: rhodecode/lib/utils2.py:524 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:531 +#: rhodecode/lib/utils2.py:530 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:540 +#: rhodecode/lib/utils2.py:539 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:542 +#: rhodecode/lib/utils2.py:541 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:544 +#: rhodecode/lib/utils2.py:543 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:546 +#: rhodecode/lib/utils2.py:545 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:548 +#: rhodecode/lib/utils2.py:547 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:550 +#: rhodecode/lib/utils2.py:549 msgid "in ${val} and ${detail}" msgstr "" -#: 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/lib/utils2.py:553 +#: rhodecode/public/js/rhodecode-components.js:30702 +#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "прямо сейчас" @@ -2198,6 +2208,7 @@ msgstr "прямо сейчас" #: 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_11_0_0.py:2599 #: 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 @@ -2206,7 +2217,7 @@ msgstr "прямо сейчас" #: 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 +#: rhodecode/model/db.py:2626 msgid "Repository no access" msgstr "Репозитарий - нет доступа" @@ -2233,6 +2244,7 @@ msgstr "Репозитарий - нет доступа" #: 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_11_0_0.py:2600 #: 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 @@ -2241,7 +2253,7 @@ msgstr "Репозитарий - нет доступа" #: 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 +#: rhodecode/model/db.py:2627 msgid "Repository read access" msgstr "Репозитарий - доступ на чтение" @@ -2268,6 +2280,7 @@ msgstr "Репозитарий - доступ на чтение" #: 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_11_0_0.py:2601 #: 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 @@ -2276,7 +2289,7 @@ msgstr "Репозитарий - доступ на чтение" #: 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 +#: rhodecode/model/db.py:2628 msgid "Repository write access" msgstr "Репозитарий - доступ на запись" @@ -2303,6 +2316,7 @@ msgstr "Репозитарий - доступ на запись" #: 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_11_0_0.py:2602 #: 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 @@ -2311,7 +2325,7 @@ msgstr "Репозитарий - доступ на запись" #: 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 +#: rhodecode/model/db.py:2629 msgid "Repository admin access" msgstr "Репозитарий - администрирование" @@ -2378,6 +2392,7 @@ msgstr "Администратор RhodeCode " #: 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_11_0_0.py:2620 #: 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 @@ -2386,7 +2401,7 @@ msgstr "Администратор RhodeCode " #: 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 +#: rhodecode/model/db.py:2647 msgid "Repository creation disabled" msgstr "Создание репозиториев отключено" @@ -2413,6 +2428,7 @@ msgstr "Создание репозиториев отключено" #: 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_11_0_0.py:2621 #: 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 @@ -2421,7 +2437,7 @@ msgstr "Создание репозиториев отключено" #: 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 +#: rhodecode/model/db.py:2648 msgid "Repository creation enabled" msgstr "Создание репозиториев включено" @@ -2448,6 +2464,7 @@ msgstr "Создание репозиториев включено" #: 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_11_0_0.py:2625 #: 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 @@ -2456,7 +2473,7 @@ msgstr "Создание репозиториев включено" #: 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 +#: rhodecode/model/db.py:2652 msgid "Repository forking disabled" msgstr "Возможность создавать форк репозитория отключена" @@ -2483,6 +2500,7 @@ msgstr "Возможность создавать форк репозитори #: 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_11_0_0.py:2626 #: 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 @@ -2491,7 +2509,7 @@ msgstr "Возможность создавать форк репозитори #: 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 +#: rhodecode/model/db.py:2653 msgid "Repository forking enabled" msgstr "Возможность создавать форк репозитория включена" @@ -2539,6 +2557,7 @@ msgstr "Регистрация нового пользователя в RhodeCod #: 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_11_0_0.py:3328 #: 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 @@ -2547,7 +2566,11 @@ msgstr "Регистрация нового пользователя в RhodeCod #: 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 +#: rhodecode/model/db.py:3355 +#: rhodecode/public/js/rhodecode-components.js:48211 +#: rhodecode/public/js/scripts.js:40015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "Not Reviewed" msgstr "Не просмотрено" @@ -2574,6 +2597,7 @@ msgstr "Не просмотрено" #: 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_11_0_0.py:3329 #: 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 @@ -2582,7 +2606,7 @@ msgstr "Не просмотрено" #: 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 +#: rhodecode/model/db.py:3356 msgid "Approved" msgstr "Одобрено" @@ -2609,6 +2633,7 @@ msgstr "Одобрено" #: 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_11_0_0.py:3330 #: 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 @@ -2617,7 +2642,7 @@ msgstr "Одобрено" #: 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 +#: rhodecode/model/db.py:3357 msgid "Rejected" msgstr "Отклонено" @@ -2644,6 +2669,7 @@ msgstr "Отклонено" #: 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_11_0_0.py:3331 #: 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 @@ -2652,7 +2678,7 @@ msgstr "Отклонено" #: 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 +#: rhodecode/model/db.py:3358 msgid "Under Review" msgstr "На рассмотрении" @@ -2676,6 +2702,7 @@ msgstr "На рассмотрении" #: 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_11_0_0.py:2604 #: 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 @@ -2684,7 +2711,7 @@ msgstr "На рассмотрении" #: 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 +#: rhodecode/model/db.py:2631 msgid "Repository group no access" msgstr "Группа репозиториев - нет доступа" @@ -2708,6 +2735,7 @@ msgstr "Группа репозиториев - нет доступа" #: 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_11_0_0.py:2605 #: 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 @@ -2716,7 +2744,7 @@ msgstr "Группа репозиториев - нет доступа" #: 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 +#: rhodecode/model/db.py:2632 msgid "Repository group read access" msgstr "Группа репозиториев - доступ на чтение" @@ -2740,6 +2768,7 @@ msgstr "Группа репозиториев - доступ на чтение" #: 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_11_0_0.py:2606 #: 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 @@ -2748,7 +2777,7 @@ msgstr "Группа репозиториев - доступ на чтение" #: 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 +#: rhodecode/model/db.py:2633 msgid "Repository group write access" msgstr "Группа репозиториев - доступ на запись" @@ -2772,6 +2801,7 @@ msgstr "Группа репозиториев - доступ на запись" #: 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_11_0_0.py:2607 #: 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 @@ -2780,7 +2810,7 @@ msgstr "Группа репозиториев - доступ на запись" #: 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 +#: rhodecode/model/db.py:2634 msgid "Repository group admin access" msgstr "Группа репозиториев - администрирование" @@ -2803,6 +2833,7 @@ msgstr "Группа репозиториев - администрировани #: 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_11_0_0.py:2609 #: 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 @@ -2811,7 +2842,7 @@ msgstr "Группа репозиториев - администрировани #: 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 +#: rhodecode/model/db.py:2636 msgid "User group no access" msgstr "Группа пользователей - нет доступа" @@ -2834,6 +2865,7 @@ msgstr "Группа пользователей - нет доступа" #: 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_11_0_0.py:2610 #: 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 @@ -2842,7 +2874,7 @@ msgstr "Группа пользователей - нет доступа" #: 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 +#: rhodecode/model/db.py:2637 msgid "User group read access" msgstr "Группа пользователей - доступ на чтение" @@ -2865,6 +2897,7 @@ msgstr "Группа пользователей - доступ на чтение #: 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_11_0_0.py:2611 #: 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 @@ -2873,7 +2906,7 @@ msgstr "Группа пользователей - доступ на чтение #: 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 +#: rhodecode/model/db.py:2638 msgid "User group write access" msgstr "Группа пользователей - доступ на запись" @@ -2896,6 +2929,7 @@ msgstr "Группа пользователей - доступ на запись #: 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_11_0_0.py:2612 #: 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 @@ -2904,7 +2938,7 @@ msgstr "Группа пользователей - доступ на запись #: 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 +#: rhodecode/model/db.py:2639 msgid "User group admin access" msgstr "Группа пользователей - администрирование" @@ -2927,6 +2961,7 @@ msgstr "Группа пользователей - администрирован #: 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_11_0_0.py:2614 #: 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 @@ -2935,7 +2970,7 @@ msgstr "Группа пользователей - администрирован #: 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 +#: rhodecode/model/db.py:2641 msgid "Repository Group creation disabled" msgstr "Создание групп репозиториев отключено" @@ -2958,6 +2993,7 @@ msgstr "Создание групп репозиториев отключено" #: 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_11_0_0.py:2615 #: 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 @@ -2966,7 +3002,7 @@ msgstr "Создание групп репозиториев отключено" #: 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 +#: rhodecode/model/db.py:2642 msgid "Repository Group creation enabled" msgstr "Создание групп репозиториев включено" @@ -2989,6 +3025,7 @@ msgstr "Создание групп репозиториев включено" #: 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_11_0_0.py:2617 #: 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 @@ -2997,7 +3034,7 @@ msgstr "Создание групп репозиториев включено" #: 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 +#: rhodecode/model/db.py:2644 msgid "User Group creation disabled" msgstr "Создание групп пользователей отключено" @@ -3020,6 +3057,7 @@ msgstr "Создание групп пользователей отключен #: 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_11_0_0.py:2618 #: 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 @@ -3028,7 +3066,7 @@ msgstr "Создание групп пользователей отключен #: 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 +#: rhodecode/model/db.py:2645 msgid "User Group creation enabled" msgstr "Создание групп пользователей включено" @@ -3051,6 +3089,7 @@ msgstr "Создание групп пользователей включено" #: 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_11_0_0.py:2628 #: 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 @@ -3059,7 +3098,7 @@ msgstr "Создание групп пользователей включено" #: 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 +#: rhodecode/model/db.py:2655 msgid "Registration disabled" msgstr "Регистрация отключена" @@ -3082,6 +3121,7 @@ msgstr "Регистрация отключена" #: 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_11_0_0.py:2629 #: 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 @@ -3090,7 +3130,7 @@ msgstr "Регистрация отключена" #: 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 +#: rhodecode/model/db.py:2656 msgid "User Registration with manual account activation" msgstr "Регистрация пользователя с ручной активацией учётной записи" @@ -3113,6 +3153,7 @@ msgstr "Регистрация пользователя с ручной акти #: 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_11_0_0.py:2630 #: 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 @@ -3121,7 +3162,7 @@ msgstr "Регистрация пользователя с ручной акти #: 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 +#: rhodecode/model/db.py:2657 msgid "User Registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией учётной записи" @@ -3144,6 +3185,7 @@ msgstr "Регистрация пользователя с автоматиче #: 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_11_0_0.py:2636 #: 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 @@ -3152,7 +3194,7 @@ msgstr "Регистрация пользователя с автоматиче #: 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 +#: rhodecode/model/db.py:2663 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "Ручная активация внешней учетной записи" @@ -3175,6 +3217,7 @@ msgstr "Ручная активация внешней учетной запис #: 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_11_0_0.py:2637 #: 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 @@ -3183,7 +3226,7 @@ msgstr "Ручная активация внешней учетной запис #: 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 +#: rhodecode/model/db.py:2664 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "Автоматическая активация внешней учетной записи" @@ -3200,6 +3243,7 @@ msgstr "Автоматическая активация внешней учет #: 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_11_0_0.py:2622 #: 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 @@ -3208,7 +3252,7 @@ msgstr "Автоматическая активация внешней учет #: 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 +#: rhodecode/model/db.py:2649 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3226,6 +3270,7 @@ msgstr "" #: 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_11_0_0.py:2623 #: 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 @@ -3234,7 +3279,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2650 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3249,6 +3294,7 @@ msgstr "" #: 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_11_0_0.py:2597 #: 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 @@ -3257,7 +3303,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2624 msgid "RhodeCode Super Administrator" msgstr "" @@ -3269,6 +3315,7 @@ msgstr "" #: 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_11_0_0.py:2639 #: 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 @@ -3277,7 +3324,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2666 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3289,6 +3336,7 @@ msgstr "" #: 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_11_0_0.py:2640 #: 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 @@ -3297,10 +3345,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2667 msgid "Inherit object permissions from default user enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 #: 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 @@ -3309,10 +3358,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: 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 +#: rhodecode/model/db.py:1107 msgid "all" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3321,10 +3371,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: 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 +#: rhodecode/model/db.py:1108 msgid "http/web interface" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3333,10 +3384,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: 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 +#: rhodecode/model/db.py:1109 msgid "vcs (git/hg/svn protocol)" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3345,10 +3397,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: 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 +#: rhodecode/model/db.py:1110 msgid "api calls" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 #: 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 @@ -3357,10 +3410,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:1111 msgid "feed access" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 #: 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 @@ -3369,60 +3423,51 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2387 msgid "No parent" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 #: 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 +#: rhodecode/model/db.py:2659 msgid "Password reset enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 #: 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 +#: rhodecode/model/db.py:2660 msgid "Password reset hidden" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 #: 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 +#: rhodecode/model/db.py:2661 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:150 -msgid "Invalid search query. Try quoting it." -msgstr "Недопустимый поисковый запрос. Попробуйте заключить его в кавычки." - -#: rhodecode/lib/index/whoosh.py:152 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh." - -#: rhodecode/lib/index/whoosh.py:157 -msgid "An error occurred during this search operation" -msgstr "Произошла ошибка при выполнении этого поиска" - -#: rhodecode/lib/index/whoosh.py:165 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:166 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" @@ -3442,28 +3487,28 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:382 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:376 +#: rhodecode/model/comment.py:383 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:87 +#: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "Пожалуйста, введите логин" -#: rhodecode/model/forms.py:88 +#: rhodecode/model/forms.py:89 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Введите значение длиной не менее %(min)i символов" -#: rhodecode/model/forms.py:98 +#: rhodecode/model/forms.py:99 msgid "Please enter a password" msgstr "Пожалуйста, введите пароль" -#: rhodecode/model/forms.py:99 +#: rhodecode/model/forms.py:100 #, python-format msgid "Enter %(min)i characters or more" msgstr "Введите не менее %(min)i символов" @@ -3550,8 +3595,8 @@ msgstr "Чтение" #: 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 -#: rhodecode/templates/changeset/changeset_file_comment.mako:321 +#: rhodecode/templates/changeset/changeset_file_comment.mako:272 +#: rhodecode/templates/changeset/changeset_file_comment.mako:322 msgid "Write" msgstr "Запись" @@ -3585,8 +3630,8 @@ 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:417 -#: rhodecode/templates/base/base.mako:424 +#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:426 msgid "Admin" msgstr "Администратор" @@ -3703,115 +3748,79 @@ msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1218 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1168 +#: rhodecode/model/pull_request.py:1220 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1181 +#: rhodecode/model/pull_request.py:1233 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1200 +#: rhodecode/model/pull_request.py:1252 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1203 +#: rhodecode/model/pull_request.py:1255 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 +#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 msgid "Bookmarks" msgstr "Закладки" -#: rhodecode/model/pull_request.py:1370 +#: rhodecode/model/pull_request.py:1425 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1373 +#: rhodecode/model/pull_request.py:1428 msgid "Closed Branches" msgstr "Закрытые ветки" -#: rhodecode/model/pull_request.py:1533 +#: rhodecode/model/pull_request.py:1588 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1546 +#: rhodecode/model/pull_request.py:1601 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1561 +#: rhodecode/model/pull_request.py:1616 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1564 +#: rhodecode/model/pull_request.py:1619 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1599 +#: rhodecode/model/pull_request.py:1654 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1604 +#: rhodecode/model/pull_request.py:1659 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1611 +#: rhodecode/model/pull_request.py:1666 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1613 +#: rhodecode/model/pull_request.py:1668 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:762 +#: rhodecode/model/scm.py:775 msgid "latest tip" msgstr "последняя версия" -#: rhodecode/model/user.py:166 -msgid "You can't Edit this user since it's crucial for entire application" -msgstr "Вы не можете редактировать пользователя, поскольку это критично для работы всего приложения" - -#: 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:506 -msgid "You can't remove this user since it's crucial for entire application" -msgstr "Вы не можете удалить пользователя, поскольку это критично для работы всего приложения" - -#: 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: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:532 -#, python-format -msgid "" -"user \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups:%s" -msgstr "" - -#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99 +#: rhodecode/model/validators.py:92 rhodecode/model/validators.py:93 msgid "Value cannot be an empty list" msgstr "Значение не может быть пустым списком" -#: rhodecode/model/validators.py:142 +#: rhodecode/model/validators.py:139 msgid "Pattern already exists" msgstr "" @@ -3832,30 +3841,26 @@ msgid "" "dashes and must begin with alphanumeric character or underscore" msgstr "Имя пользователя может содержать только буквы, цифры, символы подчеркивания, точки и тире; а так же должно начинаться с буквы, цифры либо с символа подчеркивания" -#: rhodecode/model/validators.py:192 -msgid "The input is not valid" -msgstr "" - -#: rhodecode/model/validators.py:199 +#: rhodecode/model/validators.py:195 #, python-format msgid "Username %(username)s is not valid" msgstr "Имя \"%(username)s\" недопустимо" -#: rhodecode/model/validators.py:200 +#: rhodecode/model/validators.py:196 #, python-format msgid "Username %(username)s is disabled" msgstr "" -#: rhodecode/model/validators.py:223 +#: rhodecode/model/validators.py:221 msgid "Invalid user group name" msgstr "Недопустимое имя группы пользователей" -#: rhodecode/model/validators.py:224 +#: rhodecode/model/validators.py:222 #, python-format msgid "User group `%(usergroup)s` already exists" msgstr "" -#: rhodecode/model/validators.py:226 +#: rhodecode/model/validators.py:224 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -3883,166 +3888,166 @@ msgstr "" msgid "no permission to store repository group in root location" msgstr "" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:387 msgid "Invalid characters (non-ascii) in password" msgstr "Недопустимые символы (не ascii) в пароле" -#: rhodecode/model/validators.py:401 -msgid "Invalid old password" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:406 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: rhodecode/model/validators.py:436 +#: rhodecode/model/validators.py:426 msgid "invalid password" msgstr "неверный пароль" -#: rhodecode/model/validators.py:437 +#: rhodecode/model/validators.py:427 msgid "invalid user name" msgstr "неверное имя пользователя" -#: rhodecode/model/validators.py:438 +#: rhodecode/model/validators.py:428 msgid "Your account is disabled" msgstr "Ваш аккаунт выключен" -#: rhodecode/model/validators.py:470 -msgid "Token mismatch" -msgstr "Несовпадение токенов" - -#: rhodecode/model/validators.py:484 +#: rhodecode/model/validators.py:464 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Имя репозитория %(repo)s запрещено" -#: rhodecode/model/validators.py:486 +#: rhodecode/model/validators.py:466 #, python-format msgid "Repository with name %(repo)s already exists" msgstr "" -#: rhodecode/model/validators.py:488 +#: rhodecode/model/validators.py:468 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Группа репозиториев \"%(repo)s\" уже существует" -#: rhodecode/model/validators.py:491 +#: rhodecode/model/validators.py:471 #, python-format msgid "Repository with name %(repo)s exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:493 +#: rhodecode/model/validators.py:473 #, python-format msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:566 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219 msgid "Repository name cannot end with .git" msgstr "" -#: rhodecode/model/validators.py:640 +#: rhodecode/model/validators.py:626 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "" -#: rhodecode/model/validators.py:641 +#: rhodecode/model/validators.py:627 #, python-format msgid "" "Invalid clone url, provide a valid clone url starting with one of " "%(allowed_prefixes)s" msgstr "" -#: rhodecode/model/validators.py:670 +#: rhodecode/model/validators.py:659 msgid "Fork have to be the same type as parent" msgstr "Тип форка будет совпадать с родительским" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:676 msgid "You do not have the permission to create repositories in this group." msgstr "" -#: rhodecode/model/validators.py:688 +#: rhodecode/model/validators.py:679 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "" "You do not have the permission to store repositories in the root location." msgstr "" -#: rhodecode/model/validators.py:748 +#: rhodecode/model/validators.py:739 msgid "This username or user group name is not valid" msgstr "Данное имя пользователя или группы пользователей недопустимо" -#: rhodecode/model/validators.py:879 +#: rhodecode/model/validators.py:852 msgid "This is not a valid path" msgstr "Этот путь ошибочен" -#: rhodecode/model/validators.py:894 +#: rhodecode/model/validators.py:870 msgid "This e-mail address is already taken" msgstr "Этот E-mail уже занят" -#: rhodecode/model/validators.py:914 +#: rhodecode/model/validators.py:892 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "\"%(email)s\" не существует" -#: rhodecode/model/validators.py:935 +#: rhodecode/model/validators.py:913 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "Ревизии %(revs)s уже включены в pull-request или имеют установленный статус" -#: rhodecode/model/validators.py:966 -#: rhodecode/model/validation_schema/validators.py:40 -#: rhodecode/model/validation_schema/validators.py:53 +#: rhodecode/model/validators.py:946 +#: rhodecode/model/validation_schema/validators.py:41 +#: rhodecode/model/validation_schema/validators.py:54 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "Пожалуйста, введите существующий IPv4 или IpV6 адре" -#: rhodecode/model/validators.py:967 +#: rhodecode/model/validators.py:947 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - неверно)" -#: rhodecode/model/validators.py:994 +#: rhodecode/model/validators.py:975 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "Ключевое имя может только состоять из букв, символа подчеркивания, тире или чисел" -#: rhodecode/model/validators.py:1009 +#: rhodecode/model/validators.py:992 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: rhodecode/model/validators.py:1012 +#: rhodecode/model/validators.py:995 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "" -#: rhodecode/model/validators.py:1015 +#: rhodecode/model/validators.py:998 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validators.py:1017 +#: rhodecode/model/validators.py:1000 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validation_schema/validators.py:61 +#: rhodecode/model/validators.py:1068 +msgid "Url must start with http or /" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:62 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:70 +#: rhodecode/model/validation_schema/validators.py:71 msgid "Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/validators.py:132 +#: rhodecode/model/validation_schema/validators.py:133 msgid "" "Invalid clone url, provide a valid clone url starting with one of " "{allowed_prefixes}" msgstr "" -#: rhodecode/model/validation_schema/validators.py:138 +#: rhodecode/model/validation_schema/validators.py:139 msgid "invalid clone url for {repo_type} repository" msgstr "" +#: rhodecode/model/validation_schema/validators.py:148 +msgid "Please enter a valid json object" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -4091,35 +4096,35 @@ msgstr "" msgid "Integration scope" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 msgid "General integration options" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 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:113 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: 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:136 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4159,451 +4164,451 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: 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/rhodecode-components.js:28706 +#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: 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/rhodecode-components.js:30637 +#: rhodecode/public/js/scripts.js:22485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: 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/rhodecode-components.js:30638 +#: rhodecode/public/js/scripts.js:22486 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: 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/rhodecode-components.js:30639 +#: rhodecode/public/js/scripts.js:22487 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: 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/rhodecode-components.js:30640 +#: rhodecode/public/js/scripts.js:22488 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: 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/rhodecode-components.js:30641 +#: rhodecode/public/js/scripts.js:22489 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: 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/rhodecode-components.js:30642 +#: rhodecode/public/js/scripts.js:22490 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: 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/rhodecode-components.js:30662 +#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: 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/rhodecode-components.js:30670 +#: rhodecode/public/js/scripts.js:22518 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: 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/rhodecode-components.js:30682 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: 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/rhodecode-components.js:30684 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: 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/rhodecode-components.js:30688 +#: rhodecode/public/js/scripts.js:22536 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: 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/rhodecode-components.js:30690 +#: rhodecode/public/js/scripts.js:22538 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: 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/rhodecode-components.js:30692 +#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: 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-components.js:44751 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: 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-components.js:44754 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: 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-components.js:44757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: 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-components.js:44760 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: 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-components.js:44764 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: 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:43213 -#: rhodecode/public/js/scripts.js:35061 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:44766 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: 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:43218 -#: rhodecode/public/js/scripts.js:35066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:44771 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: 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-components.js:44773 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: 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-components.js:44778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: 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-components.js:44780 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: 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-components.js:44784 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: 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-components.js:44786 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: 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/rhodecode-components.js:45724 +#: rhodecode/public/js/scripts.js:37528 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: 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/rhodecode-components.js:45726 +#: rhodecode/public/js/scripts.js:37530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: 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/rhodecode-components.js:46172 +#: rhodecode/public/js/scripts.js:37976 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: 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/rhodecode-components.js:46191 +#: rhodecode/public/js/scripts.js:37995 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: 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/rhodecode-components.js:46210 +#: rhodecode/public/js/scripts.js:38014 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:44673 -#: rhodecode/public/js/scripts.js:36521 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:46230 +#: rhodecode/public/js/scripts.js:38034 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: 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/rhodecode-components.js:46597 +#: rhodecode/public/js/scripts.js:38401 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: 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/rhodecode-components.js:46681 +#: rhodecode/public/js/scripts.js:38485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: 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/rhodecode-components.js:46696 +#: rhodecode/public/js/scripts.js:38500 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: 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:45296 -#: rhodecode/public/js/scripts.js:37144 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:46853 +#: rhodecode/public/js/scripts.js:38657 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "Применение..." -#: 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/rhodecode-components.js:46904 +#: rhodecode/public/js/scripts.js:38708 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: 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:45452 -#: rhodecode/public/js/scripts.js:37300 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:538 +#: rhodecode/public/js/rhodecode-components.js:47014 +#: rhodecode/public/js/scripts.js:38818 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/comments.js:543 msgid "Delete this comment?" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47084 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:613 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47161 +#: rhodecode/public/js/scripts.js:38965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode/comments.js:690 msgid "Leave a comment on line {0}." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47275 +#: rhodecode/public/js/scripts.js:39079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/comments.js:804 msgid "TODO from comment {0} was fixed." msgstr "" -#: 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/rhodecode-components.js:47455 +#: rhodecode/public/js/scripts.js:39259 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: 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/rhodecode-components.js:47457 +#: rhodecode/public/js/scripts.js:39261 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: 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/rhodecode-components.js:47466 +#: rhodecode/public/js/scripts.js:39270 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "Нет совпадений" -#: 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/rhodecode-components.js:47601 +#: rhodecode/public/js/scripts.js:39405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "Ссылка выбора" -#: 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/rhodecode-components.js:47641 +#: rhodecode/public/js/scripts.js:39445 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "Отменить наблюдение за репозиторием" -#: 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/rhodecode-components.js:47642 +#: rhodecode/public/js/scripts.js:39446 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "Не наблюдать" -#: 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/rhodecode-components.js:47651 +#: rhodecode/public/js/scripts.js:39455 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "Наблюдать за репозиторием" -#: 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/rhodecode-components.js:47652 +#: rhodecode/public/js/scripts.js:39456 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "Наблюдать" -#: 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/rhodecode-components.js:48032 +#: rhodecode/public/js/scripts.js:39836 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: 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:46510 -#: rhodecode/public/js/scripts.js:38358 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:48041 +#: rhodecode/public/js/scripts.js:39845 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48046 +#: rhodecode/public/js/scripts.js:39850 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: 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/rhodecode-components.js:48052 +#: rhodecode/public/js/scripts.js:39856 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48068 +#: rhodecode/public/js/scripts.js:39872 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46530 -#: rhodecode/public/js/scripts.js:38378 +#: rhodecode/public/js/rhodecode-components.js:48075 +#: rhodecode/public/js/scripts.js:39879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48082 +#: rhodecode/public/js/scripts.js:39886 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48096 +#: rhodecode/public/js/scripts.js:39900 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48198 +#: rhodecode/public/js/scripts.js:40002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:300 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46823 -#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode-components.js:48204 +#: rhodecode/public/js/scripts.js:40008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +msgid "User `{0}` already in reviewers" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48334 +#: rhodecode/public/js/scripts.js:40138 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:436 msgid "added manually by \"{0}\"" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48338 +#: rhodecode/public/js/scripts.js:40142 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:440 msgid "member of \"{0}\"" msgstr "" -#: 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/rhodecode-components.js:48924 +#: rhodecode/public/js/scripts.js:40728 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: 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/rhodecode-components.js:48944 +#: rhodecode/public/js/scripts.js:40748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: 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 +#: rhodecode/public/js/rhodecode-components.js:49356 +#: rhodecode/public/js/scripts.js:41160 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode.js:574 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 +#: rhodecode/public/js/rhodecode-components.js:49364 +#: rhodecode/public/js/scripts.js:41168 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/src/rhodecode.js:582 msgid "Specified expiration date" msgstr "" @@ -4612,174 +4617,180 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:488 -#: rhodecode/templates/codeblocks/diffs.mako:493 +#: rhodecode/templates/codeblocks/diffs.mako:494 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Add another comment" msgstr "Добавить другой комментарий" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 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/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No branches available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No forks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No gists available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No repositories available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No repository groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 msgid "No ssh keys available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 msgid "No tags available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 msgid "No user groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No users available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/templates/changelog/changelog.mako:59 msgid "Open new pull request" msgstr "Создать новый pull запрос" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: 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:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "отключено" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "files" msgstr "файлы" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "загрузка..." -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 msgid "{0} out of {1} ssh keys" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 msgid "{0} years" msgstr "" @@ -4853,12 +4864,17 @@ msgstr "Вы имеете администраторские права на э msgid "Edit Repository Group" msgstr "Изменить группу репозиториев" -#: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:68 +msgid "No repositories or repositories groups exists here." +msgstr "" + +#: rhodecode/templates/index_base.mako:86 +#: rhodecode/templates/index_base.mako:116 #: rhodecode/templates/admin/gists/index.mako:112 #: 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_user_group_membership.mako:39 #: 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 @@ -4875,13 +4891,14 @@ msgstr "Изменить группу репозиториев" msgid "Name" msgstr "Имя" -#: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/index_base.mako:89 +#: rhodecode/templates/index_base.mako:119 #: 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/my_account/my_account_user_group_membership.mako:44 #: 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:55 @@ -4911,20 +4928,21 @@ msgstr "Имя" #: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 -#: rhodecode/templates/summary/components.mako:82 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "Описание" -#: rhodecode/templates/index_base.mako:103 -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:92 +#: rhodecode/templates/index_base.mako:122 #: 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/index_base.mako:94 +#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 @@ -4936,11 +4954,11 @@ msgstr "Последнее изменение" #: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:68 -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:209 msgid "Owner" msgstr "Владелец" -#: rhodecode/templates/index_base.mako:134 +#: rhodecode/templates/index_base.mako:125 #: 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 @@ -4952,7 +4970,7 @@ msgstr "Владелец" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4969,7 +4987,7 @@ msgid "Home" msgstr "Домой" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:343 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "Войти" @@ -4993,7 +5011,7 @@ msgstr "" #: rhodecode/templates/login.mako:68 #: rhodecode/templates/password_reset.mako:37 -#: rhodecode/templates/base/base.mako:46 +#: rhodecode/templates/base/base.mako:48 #: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "" @@ -5148,7 +5166,7 @@ msgid "Repository" msgstr "Репозитарий" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:77 msgid "Admin audit logs" msgstr "" @@ -5335,7 +5353,7 @@ 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/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 @@ -5409,7 +5427,7 @@ msgstr "" #: 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:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5512,8 +5530,8 @@ msgstr "Группы репозиториев" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: 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:249 +#: rhodecode/templates/base/base.mako:86 +#: rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "Настройки" @@ -5616,7 +5634,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:355 +#: rhodecode/templates/base/base.mako:357 msgid "My account" msgstr "Мой аккаунт" @@ -5644,35 +5662,40 @@ msgstr "" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:36 -msgid "OAuth Identities" +#: rhodecode/templates/admin/my_account/my_account.mako:33 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 +msgid "User Group Membership" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:38 +msgid "OAuth Identities" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "Watched" msgstr "Просмотрено" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:43 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 -#: rhodecode/templates/base/base.mako:239 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "Pull-request'ы" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:44 #: 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 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:82 msgid "Permissions" msgstr "Привилегии" -#: rhodecode/templates/admin/my_account/my_account.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:45 msgid "Live Notifications" msgstr "" @@ -5898,6 +5921,23 @@ msgid "" "sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +msgid "Click add to use this generate SSH key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 +#: 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: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 +#: rhodecode/templates/admin/users/users.mako:74 +msgid "Active" +msgstr "Активный" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" @@ -6111,8 +6151,8 @@ msgstr "Добавить группу репозиториев" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:77 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:153 msgid "Repository groups" msgstr "Группы репозиториев" @@ -6301,7 +6341,7 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:196 +#: rhodecode/templates/base/base.mako:198 msgid "Clone from" msgstr "Клонировать из" @@ -6381,7 +6421,7 @@ msgid "Remote" msgstr "Удалённый" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:143 +#: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "Статистика" @@ -6406,100 +6446,104 @@ msgstr "" msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Attached scoped tokens" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:25 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 msgid "Set" msgstr "Набор" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40 msgid "Manually set this repository as a fork of another from the list" msgstr "Вручную сделать этот репозиторий форком выбранного из списка" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:49 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 msgid "" "All actions made on this repository will be visible to everyone following " "the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "" "Force repository locking. This only works when anonymous access is disabled." " Pulling from the repository locks the repository to that user until the " "same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "Отсоединить fork'и" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "Удалить fork'и" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 #: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Подтвердите удаление этого репозитория: %s" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 msgid "" "This repository will be renamed in a special way in order to make it " "inaccessible to RhodeCode Enterprise and its VCS systems. If you need to " @@ -6507,11 +6551,11 @@ msgid "" "rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" @@ -6559,17 +6603,6 @@ msgstr "Префикс" msgid "Key" 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: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 -#: rhodecode/templates/admin/users/users.mako:74 -msgid "Active" -msgstr "Активный" - #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" @@ -6731,8 +6764,8 @@ msgid "Settings for Repository: %s" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 -msgid "Non-changeable id" -msgstr "Неизменяемый id" +msgid "permalink id" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "what is that ?" @@ -6926,7 +6959,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:210 +#: rhodecode/templates/admin/settings/settings_visual.mako:214 msgid "Save settings" msgstr "Сохранить настройки" @@ -7220,6 +7253,14 @@ msgstr "" msgid "Gunicorn process management" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:11 +msgid "start auto refresh" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:12 +msgid "stop auto refresh" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -7270,13 +7311,6 @@ msgstr "" msgid "Cleanup sessions" msgstr "" -#: rhodecode/templates/admin/settings/settings_supervisor_tail.mako:1 -#, python-format -msgid "" -"Last %(size)s bytes of process logs, use ?offset=[num] GET param to set " -"custom size" -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7432,24 +7466,26 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:170 -msgid "Clone URL" +msgid "Clone URL templates" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:179 +#: rhodecode/templates/admin/settings/settings_visual.mako:181 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" " {user} current user username,\n" +" {sys_user} current system user running this process, usefull for ssh,\n" +" {hostname} hostname of this server running RhodeCode,\n" " {netloc} network location/server host of running RhodeCode server,\n" " {repo} full repository name,\n" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:192 +#: rhodecode/templates/admin/settings/settings_visual.mako:196 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:200 +#: rhodecode/templates/admin/settings/settings_visual.mako:204 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7464,8 +7500,8 @@ msgstr "Добавить группу пользователей" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:79 -#: rhodecode/templates/base/base.mako:154 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:156 msgid "User groups" msgstr "Группы пользователей" @@ -7613,7 +7649,7 @@ msgstr "Добавить пользователя" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:80 msgid "Users" msgstr "Пользователи" @@ -7877,13 +7913,17 @@ msgstr "" msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:25 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" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 +msgid "Use this generated key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +msgid "Confirmation required on the next screen" msgstr "" #: rhodecode/templates/admin/users/users.mako:5 @@ -7894,174 +7934,174 @@ msgstr "Администрирование пользователей" msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:53 +#: rhodecode/templates/base/base.mako:55 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:83 msgid "Authentication" msgstr "Аутентификация" -#: rhodecode/templates/base/base.mako:83 +#: rhodecode/templates/base/base.mako:85 msgid "Defaults" msgstr "Значения по умолчанию" -#: rhodecode/templates/base/base.mako:101 +#: rhodecode/templates/base/base.mako:103 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:188 +#: rhodecode/templates/base/base.mako:190 msgid "Fork of" msgstr "Форк от" -#: rhodecode/templates/base/base.mako:205 +#: rhodecode/templates/base/base.mako:207 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:210 +#: rhodecode/templates/base/base.mako:212 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:228 +#: rhodecode/templates/base/base.mako:230 #: 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/base/base.mako:231 #: 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/base/base.mako:232 #: 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:231 +#: rhodecode/templates/base/base.mako:233 #: 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:235 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "Показать pull-request'ы для %s" -#: rhodecode/templates/base/base.mako:245 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "Опции" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: 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/base/base.mako:269 +#: rhodecode/templates/base/base.mako:413 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "Поиск" -#: rhodecode/templates/base/base.mako:271 +#: rhodecode/templates/base/base.mako:273 msgid "Unlock" msgstr "Разблокировать" -#: rhodecode/templates/base/base.mako:273 +#: rhodecode/templates/base/base.mako:275 msgid "Lock" msgstr "Заблокировать" -#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/base/base.mako:280 #: rhodecode/templates/data_table/_dt_elements.mako:61 #: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "Форк" -#: rhodecode/templates/base/base.mako:279 +#: rhodecode/templates/base/base.mako:281 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:303 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:309 +#: rhodecode/templates/base/base.mako:311 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/base/base.mako:328 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:336 +#: rhodecode/templates/base/base.mako:338 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:338 +#: rhodecode/templates/base/base.mako:340 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:357 +#: rhodecode/templates/base/base.mako:359 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:361 +#: rhodecode/templates/base/base.mako:363 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:393 +#: rhodecode/templates/base/base.mako:395 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:396 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:15 msgid "Journal" msgstr "Журнал" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:401 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:402 msgid "Public journal" msgstr "Общедоступный журнал" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:407 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:408 msgid "Gists" msgstr "Gist" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:412 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/base/base.mako:418 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:433 -#: rhodecode/templates/base/base.mako:434 +#: rhodecode/templates/base/base.mako:435 +#: rhodecode/templates/base/base.mako:436 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8083,15 +8123,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:491 +#: rhodecode/templates/base/base.mako:493 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:546 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:554 msgid "Site-wide shortcuts" msgstr "" @@ -8198,8 +8238,8 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:274 -#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:325 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8544,10 +8584,10 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changelog/changelog_elements.mako:121 #: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 -#: rhodecode/templates/summary/summary_commits.mako:62 +#: rhodecode/templates/summary/summary_commits.mako:68 #, python-format msgid "Bookmark %s" msgstr "Закладка %s" @@ -8566,10 +8606,10 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changelog/changelog_elements.mako:113 #: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 -#: rhodecode/templates/summary/summary_commits.mako:76 +#: rhodecode/templates/summary/summary_commits.mako:82 #, python-format msgid "Branch %s" msgstr "Ветка %s" @@ -8634,79 +8674,79 @@ msgstr "Изменений ещё нет" msgid "load previous" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/summary/summary_commits.mako:21 +#: rhodecode/templates/changelog/changelog_elements.mako:32 +#: rhodecode/templates/summary/summary_commits.mako:27 #, python-format msgid "" "Commit status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/summary/summary_commits.mako:25 +#: rhodecode/templates/changelog/changelog_elements.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: {}" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/summary/summary_commits.mako:31 +#: rhodecode/templates/changelog/changelog_elements.mako:42 +#: rhodecode/templates/summary/summary_commits.mako:37 msgid "Commit status: Not Reviewed" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/summary/summary_commits.mako:36 +#: rhodecode/templates/changelog/changelog_elements.mako:47 +#: rhodecode/templates/summary/summary_commits.mako:42 msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changelog/changelog_elements.mako:58 #: rhodecode/templates/changeset/changeset.mako:42 msgid "Copy the full commit id" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changelog/changelog_elements.mako:65 #: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:72 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: rhodecode/templates/changeset/changeset.mako:50 #: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:72 #: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: 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/changelog/changelog_elements.mako:83 +#: rhodecode/templates/compare/compare_commits.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changelog/changelog_elements.mako:107 #: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "свести" -#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 -#: rhodecode/templates/summary/summary_commits.mako:69 +#: rhodecode/templates/summary/summary_commits.mako:75 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "Метка %s" -#: rhodecode/templates/changelog/changelog_elements.mako:137 +#: rhodecode/templates/changelog/changelog_elements.mako:143 msgid "load next" msgstr "" @@ -8741,7 +8781,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:81 +#: rhodecode/templates/changeset/changeset_file_comment.mako:82 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8757,8 +8797,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:445 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:451 +#: rhodecode/templates/codeblocks/diffs.mako:454 msgid "Raw diff" msgstr "Отобразить в формате diff" @@ -8775,8 +8815,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:452 -#: rhodecode/templates/codeblocks/diffs.mako:455 +#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:461 msgid "Download diff" msgstr "Скачать diff" @@ -8800,103 +8840,103 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:32 +#: rhodecode/templates/changeset/changeset_file_comment.mako:33 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:39 +#: rhodecode/templates/changeset/changeset_file_comment.mako:40 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:66 -#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:67 +#: rhodecode/templates/changeset/changeset_file_comment.mako:69 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:73 +#: rhodecode/templates/changeset/changeset_file_comment.mako:74 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:88 +#: rhodecode/templates/changeset/changeset_file_comment.mako:89 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 msgid "Pull request author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +#: rhodecode/templates/changeset/changeset_file_comment.mako:98 msgid "author" msgstr "автор" -#: rhodecode/templates/changeset/changeset_file_comment.mako:105 +#: rhodecode/templates/changeset/changeset_file_comment.mako:106 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:109 -#: rhodecode/templates/changeset/changeset_file_comment.mako:124 +#: rhodecode/templates/changeset/changeset_file_comment.mako:110 +#: rhodecode/templates/changeset/changeset_file_comment.mako:125 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:121 +#: rhodecode/templates/changeset/changeset_file_comment.mako:122 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:151 -#: rhodecode/templates/changeset/changeset_file_comment.mako:154 -msgid "Prev" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:152 #: rhodecode/templates/changeset/changeset_file_comment.mako:155 +msgid "Prev" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:153 +#: rhodecode/templates/changeset/changeset_file_comment.mako:156 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:191 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:193 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:195 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: 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:65 +msgid "You need to be logged in to leave comments." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "Авторизоваться сейчас" -#: rhodecode/templates/changeset/changeset_file_comment.mako:348 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "" "Use @username inside this text to send notification to this RhodeCode user" msgstr "Используйте @имя_пользователя в тексте, чтобы отправить оповещение указанному пользователю RhodeCode" -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 +#: rhodecode/templates/changeset/changeset_file_comment.mako:352 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:368 +#: rhodecode/templates/changeset/changeset_file_comment.mako:369 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "Закрыто" -#: rhodecode/templates/changeset/changeset_file_comment.mako:398 +#: rhodecode/templates/changeset/changeset_file_comment.mako:399 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8993,71 +9033,71 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:290 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/codeblocks/diffs.mako:356 #: 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 +#: rhodecode/templates/codeblocks/diffs.mako:421 +#: rhodecode/templates/codeblocks/diffs.mako:437 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:417 -#: rhodecode/templates/codeblocks/diffs.mako:424 +#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:430 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:422 -#: rhodecode/templates/codeblocks/diffs.mako:438 +#: rhodecode/templates/codeblocks/diffs.mako:428 +#: rhodecode/templates/codeblocks/diffs.mako:444 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:433 -#: rhodecode/templates/codeblocks/diffs.mako:440 +#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:446 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:643 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:651 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:649 +#: rhodecode/templates/codeblocks/diffs.mako:655 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:650 +#: rhodecode/templates/codeblocks/diffs.mako:656 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:660 +#: rhodecode/templates/codeblocks/diffs.mako:666 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:664 +#: rhodecode/templates/codeblocks/diffs.mako:670 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:668 +#: rhodecode/templates/codeblocks/diffs.mako:674 msgid "Wide Mode Diff" msgstr "" @@ -9074,11 +9114,11 @@ msgid "Compare was calculated based on this shared commit." msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:78 msgid "No commits in this compare" msgstr "" @@ -9649,7 +9689,7 @@ msgid "Close File List" msgstr "" #: rhodecode/templates/files/files_browser.mako:25 -#: rhodecode/templates/summary/summary_commits.mako:103 +#: rhodecode/templates/summary/summary_commits.mako:109 msgid "Add New File" msgstr "" @@ -9925,12 +9965,12 @@ msgid "Pull request reviewers" msgstr "Рецензенты запросов на внесение изменений Pull request" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 msgid "Add reviewer or reviewer group" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:504 +#: rhodecode/templates/pullrequests/pullrequest.mako:508 msgid "Please select source and target" msgstr "" @@ -9938,19 +9978,19 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:364 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:368 +#: rhodecode/templates/pullrequests/pullrequest.mako:371 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:431 +#: rhodecode/templates/pullrequests/pullrequest.mako:435 msgid "Target repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:441 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Select commit reference" msgstr "" @@ -10011,8 +10051,7 @@ msgid "Merge" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:140 -#: rhodecode/templates/summary/components.mako:53 -#: rhodecode/templates/summary/components.mako:69 +#: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" @@ -10092,85 +10131,81 @@ msgid "Pull request versions not available" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 -msgid "Mandatory reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 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:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 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:431 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 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:442 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 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:482 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:593 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:596 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 msgid "show them" msgstr "" @@ -10281,74 +10316,59 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/components.mako:49 -msgid "Read-only url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -#: rhodecode/templates/summary/components.mako:72 +#: rhodecode/templates/summary/components.mako:71 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:76 +msgid "Copy the clone by ssh url" +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 +#: rhodecode/templates/summary/components.mako:80 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:65 -msgid "Clone url" -msgstr "Ссылка для клонирования" - -#: rhodecode/templates/summary/components.mako:94 +#: rhodecode/templates/summary/components.mako:100 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:110 +#: rhodecode/templates/summary/components.mako:116 msgid "Number of Repository Forks" msgstr "" -#: rhodecode/templates/summary/components.mako:118 +#: rhodecode/templates/summary/components.mako:124 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:149 +#: rhodecode/templates/summary/components.mako:155 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:153 +#: rhodecode/templates/summary/components.mako:159 msgid "Statistics are disabled for this repository" msgstr "Статистические данные отключены для этого репозитария" -#: rhodecode/templates/summary/components.mako:156 +#: rhodecode/templates/summary/components.mako:162 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:167 +#: rhodecode/templates/summary/components.mako:173 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:173 +#: rhodecode/templates/summary/components.mako:179 msgid "There are no downloads yet" msgstr "Скачиваний ещё нет" -#: rhodecode/templates/summary/components.mako:177 +#: rhodecode/templates/summary/components.mako:183 msgid "Downloads are disabled for this repository" msgstr "Скачивание отключено в этом репозитории" -#: rhodecode/templates/summary/components.mako:180 +#: rhodecode/templates/summary/components.mako:186 msgid "enable downloads" msgstr "" @@ -10381,15 +10401,15 @@ msgstr "ATOM лента репозитория %s" msgid "%s RSS feed" msgstr "RSS лента репозитория %s" -#: rhodecode/templates/summary/summary_commits.mako:100 +#: rhodecode/templates/summary/summary_commits.mako:106 msgid "Add or upload files directly via RhodeCode:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:111 +#: rhodecode/templates/summary/summary_commits.mako:117 msgid "Push new repo:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:128 msgid "Existing repository?" msgstr "Существующий репозиторий?" @@ -10417,11 +10437,3 @@ msgstr "" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" msgstr "" - -#: rhodecode/tests/lib/test_ext_json.py:163 -msgid "singular" -msgid_plural "plural" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" diff --git a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.mo index a99b5e6a..8a4c7a81 100644 Binary files a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.mo and b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.mo differ diff --git a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po index 5e818137..a978250b 100644 --- a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po @@ -1,5 +1,5 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2017 RhodeCode GmbH +# Copyright (C) 2018 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. # # Translators: @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2017-11-03 16:42+0100\n" -"PO-Revision-Date: 2017-11-03 15:43+0000\n" +"POT-Creation-Date: 2018-01-30 17:32+0100\n" +"PO-Revision-Date: 2018-01-30 16:33+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Chinese (http://www.transifex.com/rhodecode/RhodeCode/language/zh/)\n" "MIME-Version: 1.0\n" @@ -22,32 +22,53 @@ msgstr "" "Language: zh\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: rhodecode/apps/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/apps/_base/__init__.py:142 +#, python-format +msgid "Error creating repository %s: invalid certificate" +msgstr "" + +#: rhodecode/apps/_base/__init__.py:146 +#, python-format +msgid "Error creating repository %s" +msgstr "" + +#: rhodecode/apps/_base/__init__.py:219 +#, python-format +msgid "" +"The repository `%(repo_name)s` cannot be loaded in filesystem. Please check " +"if it exist, or is not damaged." +msgstr "" + +#: rhodecode/apps/_base/__init__.py:274 +msgid "Editing user `{}` is disabled." +msgstr "" + +#: rhodecode/apps/admin/navigation.py:72 rhodecode/authentication/routes.py:60 #: rhodecode/integrations/views.py:154 #: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/apps/admin/navigation.py:84 +#: rhodecode/apps/admin/navigation.py:74 #: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "VCS" msgstr "" -#: rhodecode/apps/admin/navigation.py:85 +#: rhodecode/apps/admin/navigation.py:76 msgid "Visual" msgstr "" -#: rhodecode/apps/admin/navigation.py:86 +#: rhodecode/apps/admin/navigation.py:78 msgid "Remap and Rescan" msgstr "" -#: rhodecode/apps/admin/navigation.py:87 +#: rhodecode/apps/admin/navigation.py:80 #: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Issue Tracker" msgstr "" -#: rhodecode/apps/admin/navigation.py:89 -#: rhodecode/integrations/types/email.py:232 +#: rhodecode/apps/admin/navigation.py:82 +#: rhodecode/integrations/types/email.py:233 #: rhodecode/templates/register.mako:76 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 @@ -59,15 +80,15 @@ msgstr "" msgid "Email" msgstr "电子邮件" -#: rhodecode/apps/admin/navigation.py:90 +#: rhodecode/apps/admin/navigation.py:84 msgid "Hooks" msgstr "钩子" -#: rhodecode/apps/admin/navigation.py:91 +#: rhodecode/apps/admin/navigation.py:86 msgid "Full Text Search" msgstr "全文检索" -#: rhodecode/apps/admin/navigation.py:93 +#: rhodecode/apps/admin/navigation.py:88 #: rhodecode/templates/admin/integrations/base.mako:23 #: rhodecode/templates/admin/integrations/form.mako:8 #: rhodecode/templates/admin/integrations/form.mako:21 @@ -81,28 +102,28 @@ msgstr "全文检索" #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 #: rhodecode/templates/admin/repos/repo_edit.mako:75 -#: rhodecode/templates/base/base.mako:82 +#: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "" -#: rhodecode/apps/admin/navigation.py:95 +#: rhodecode/apps/admin/navigation.py:90 #: rhodecode/templates/admin/settings/settings_system.mako:9 msgid "System Info" msgstr "系统信息" -#: rhodecode/apps/admin/navigation.py:97 +#: rhodecode/apps/admin/navigation.py:92 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:99 +#: rhodecode/apps/admin/navigation.py:94 msgid "User Sessions" msgstr "" -#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/apps/admin/navigation.py:96 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:109 +#: rhodecode/apps/admin/navigation.py:101 msgid "Labs" msgstr "" @@ -114,13 +135,13 @@ msgstr "默认设置已经成功更新" msgid "Error occurred during update of default values" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:121 +#: rhodecode/apps/admin/views/permissions.py:120 msgid "Application permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:142 +#: rhodecode/apps/admin/views/permissions.py:141 #: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:287 +#: rhodecode/apps/admin/views/permissions.py:288 msgid "Error occurred during update of permissions" msgstr "" @@ -128,11 +149,11 @@ msgstr "" msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:267 +#: rhodecode/apps/admin/views/permissions.py:268 msgid "Global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:448 +#: rhodecode/apps/admin/views/permissions.py:450 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:208 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -153,20 +174,20 @@ msgstr "" msgid "Edit" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:476 +#: rhodecode/apps/admin/views/permissions.py:478 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:479 +#: rhodecode/apps/admin/views/permissions.py:481 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:180 +#: rhodecode/apps/admin/views/repo_groups.py:181 #, python-format msgid "Created repository group %s" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:198 +#: rhodecode/apps/admin/views/repo_groups.py:199 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" @@ -175,10 +196,86 @@ msgstr "" msgid "Cleaned up old sessions" msgstr "" -#: rhodecode/apps/admin/views/sessions.py:98 +#: rhodecode/apps/admin/views/sessions.py:97 msgid "Failed to cleanup up old sessions" msgstr "" +#: rhodecode/apps/admin/views/settings.py:162 +#: rhodecode/apps/admin/views/settings.py:708 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:124 +msgid "Some form inputs contain invalid data." +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:351 +msgid "Error occurred during updating application settings" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:194 +#: rhodecode/apps/repository/views/repo_settings_vcs.py:143 +msgid "Updated VCS settings" +msgstr "成功更新版本控制系统设置" + +#: rhodecode/apps/admin/views/settings.py:268 +#, python-format +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:347 +msgid "Updated application settings" +msgstr "更新应用设置" + +#: rhodecode/apps/admin/views/settings.py:426 +msgid "Updated visualisation settings" +msgstr "成功更新可视化设置" + +#: rhodecode/apps/admin/views/settings.py:429 +msgid "Error occurred during updating visualisation settings" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:491 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125 +msgid "Invalid issue tracker pattern: {}" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:508 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134 +msgid "Updated issue tracker entries" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:526 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89 +msgid "Removed issue tracker entry" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:563 +msgid "Please enter email address" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:581 +msgid "Send email task created" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:631 +msgid "Added new hook" +msgstr "新建钩子" + +#: rhodecode/apps/admin/views/settings.py:646 +msgid "Updated hooks" +msgstr "更新钩子" + +#: rhodecode/apps/admin/views/settings.py:650 +msgid "Error occurred during hook creation" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:732 +msgid "Error occurred during updating labs settings" +msgstr "" + +#: rhodecode/apps/admin/views/settings.py:737 +msgid "Updated Labs settings" +msgstr "" + #: rhodecode/apps/admin/views/svn_config.py:46 msgid "Apache configuration for Subversion generated." msgstr "" @@ -187,149 +284,153 @@ msgstr "" msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/apps/admin/views/system_info.py:99 +#: rhodecode/apps/admin/views/system_info.py:79 msgid "" "Note: please make sure this server can access `${url}` for the update link " "to work" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:102 +#: rhodecode/apps/admin/views/system_info.py:90 msgid "Update info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:104 +#: rhodecode/apps/admin/views/system_info.py:92 msgid "Check for updates" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:109 +#: rhodecode/apps/admin/views/system_info.py:97 msgid "RhodeCode Version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:110 +#: rhodecode/apps/admin/views/system_info.py:98 +msgid "Latest version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:99 msgid "RhodeCode Server IP" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:111 +#: rhodecode/apps/admin/views/system_info.py:100 msgid "RhodeCode Server ID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:112 +#: rhodecode/apps/admin/views/system_info.py:101 msgid "RhodeCode Configuration" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:113 +#: rhodecode/apps/admin/views/system_info.py:102 msgid "RhodeCode Certificate" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:114 +#: rhodecode/apps/admin/views/system_info.py:103 msgid "Workers" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:115 +#: rhodecode/apps/admin/views/system_info.py:104 msgid "Worker Type" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:119 +#: rhodecode/apps/admin/views/system_info.py:108 msgid "Database" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:120 +#: rhodecode/apps/admin/views/system_info.py:109 msgid "Database version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:124 +#: rhodecode/apps/admin/views/system_info.py:113 msgid "Platform" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:125 +#: rhodecode/apps/admin/views/system_info.py:114 msgid "Platform UUID" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:126 +#: rhodecode/apps/admin/views/system_info.py:115 msgid "Python version" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:116 msgid "Python path" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:131 +#: rhodecode/apps/admin/views/system_info.py:120 msgid "CPU" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:132 +#: rhodecode/apps/admin/views/system_info.py:121 msgid "Load" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:133 +#: rhodecode/apps/admin/views/system_info.py:122 msgid "Memory" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:134 +#: rhodecode/apps/admin/views/system_info.py:123 msgid "Uptime" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:138 +#: rhodecode/apps/admin/views/system_info.py:127 msgid "Storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:139 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:140 +#: rhodecode/apps/admin/views/system_info.py:129 msgid "Storage inodes" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:142 +#: rhodecode/apps/admin/views/system_info.py:131 msgid "Gist storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:143 +#: rhodecode/apps/admin/views/system_info.py:132 msgid "Gist storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:145 +#: rhodecode/apps/admin/views/system_info.py:134 msgid "Archive cache storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:146 +#: rhodecode/apps/admin/views/system_info.py:135 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:148 +#: rhodecode/apps/admin/views/system_info.py:137 msgid "Temp storage location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:149 +#: rhodecode/apps/admin/views/system_info.py:138 msgid "Temp storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:140 msgid "Search info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:152 +#: rhodecode/apps/admin/views/system_info.py:141 msgid "Search location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:156 +#: rhodecode/apps/admin/views/system_info.py:145 msgid "VCS Backends" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:157 +#: rhodecode/apps/admin/views/system_info.py:146 msgid "VCS Server" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:158 +#: rhodecode/apps/admin/views/system_info.py:147 msgid "GIT" msgstr "GIT" -#: rhodecode/apps/admin/views/system_info.py:159 +#: rhodecode/apps/admin/views/system_info.py:148 msgid "HG" msgstr "HG" -#: rhodecode/apps/admin/views/system_info.py:160 +#: rhodecode/apps/admin/views/system_info.py:149 msgid "SVN" msgstr "SVN" @@ -343,188 +444,188 @@ msgstr "" msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:208 +#: rhodecode/apps/admin/views/users.py:209 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/apps/admin/views/users.py:229 +#: rhodecode/apps/admin/views/users.py:230 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:303 +#: rhodecode/apps/admin/views/users.py:304 msgid "User updated successfully" msgstr "用户更新成功" -#: rhodecode/apps/admin/views/users.py:321 -#: rhodecode/apps/my_account/views/my_account.py:485 +#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/my_account/views/my_account.py:490 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:353 +#: rhodecode/apps/admin/views/users.py:354 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:358 +#: rhodecode/apps/admin/views/users.py:359 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:366 +#: rhodecode/apps/admin/views/users.py:367 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:371 +#: rhodecode/apps/admin/views/users.py:372 #, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:379 +#: rhodecode/apps/admin/views/users.py:380 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:384 +#: rhodecode/apps/admin/views/users.py:385 #, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:401 +#: rhodecode/apps/admin/views/users.py:402 msgid "Successfully deleted user" msgstr "" -#: rhodecode/apps/admin/views/users.py:407 +#: rhodecode/apps/admin/views/users.py:408 msgid "An error occurred during deletion of user" msgstr "删除用户时发生错误" -#: rhodecode/apps/admin/views/users.py:472 +#: rhodecode/apps/admin/views/users.py:473 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 +#: rhodecode/apps/admin/views/users.py:479 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 +#: rhodecode/apps/admin/views/users.py:567 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:583 -#: rhodecode/apps/user_group/views/__init__.py:472 +#: rhodecode/apps/admin/views/users.py:585 +#: rhodecode/apps/user_group/views/__init__.py:448 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" -#: rhodecode/apps/admin/views/users.py:608 +#: rhodecode/apps/admin/views/users.py:610 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:613 +#: rhodecode/apps/admin/views/users.py:615 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:622 +#: rhodecode/apps/admin/views/users.py:624 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:661 +#: rhodecode/apps/admin/views/users.py:663 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:667 +#: rhodecode/apps/admin/views/users.py:669 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/apps/admin/views/users.py:671 +#: rhodecode/apps/admin/views/users.py:673 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:676 +#: rhodecode/apps/admin/views/users.py:678 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/apps/admin/views/users.py:701 +#: rhodecode/apps/my_account/views/my_account.py:160 #: 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:737 -#: rhodecode/apps/my_account/views/my_account.py:193 +#: rhodecode/apps/admin/views/users.py:739 +#: rhodecode/apps/my_account/views/my_account.py:194 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:766 -#: rhodecode/apps/my_account/views/my_account.py:217 +#: rhodecode/apps/admin/views/users.py:768 +#: rhodecode/apps/my_account/views/my_account.py:218 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:838 +#: rhodecode/apps/admin/views/users.py:840 #: 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/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:849 #: 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/admin/views/users.py:883 #: 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 +#: rhodecode/apps/admin/views/users.py:929 +#: rhodecode/apps/my_account/views/my_account.py:260 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:928 +#: rhodecode/apps/admin/views/users.py:935 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 +#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/my_account/views/my_account.py:266 msgid "An error occurred during email saving" msgstr "保存电子邮件时发生错误" -#: rhodecode/apps/admin/views/users.py:959 +#: rhodecode/apps/admin/views/users.py:966 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1005 +#: rhodecode/apps/admin/views/users.py:1012 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1023 +#: rhodecode/apps/admin/views/users.py:1034 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:1027 +#: rhodecode/apps/admin/views/users.py:1038 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1057 +#: rhodecode/apps/admin/views/users.py:1068 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1122 +#: rhodecode/apps/admin/views/users.py:1133 msgid "Groups successfully changed" msgstr "" @@ -549,10 +650,10 @@ 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 +#: rhodecode/public/js/rhodecode-components.js:49320 +#: rhodecode/public/js/scripts.js:41124 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 +#: rhodecode/public/js/src/rhodecode.js:538 msgid "Lifetime" msgstr "终身" @@ -603,75 +704,75 @@ msgstr "" 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/apps/home/views.py:218 rhodecode/apps/home/views.py:251 +#: rhodecode/apps/repository/views/repo_pull_requests.py:719 +#: rhodecode/templates/admin/my_account/my_account.mako:41 #: 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:580 +#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:150 +#: rhodecode/templates/base/base.mako:582 msgid "Repositories" msgstr "版本库" -#: rhodecode/apps/home/views.py:241 +#: rhodecode/apps/home/views.py:244 msgid "Groups" msgstr "组" -#: rhodecode/apps/home/views.py:261 +#: rhodecode/apps/home/views.py:264 #, python-format msgid "Commits in %(repo)s" msgstr "" -#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:177 +#: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "公共日志" -#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:181 +#: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182 msgid "journal" msgstr "日志" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:341 +#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:281 +#: rhodecode/apps/login/views.py:288 msgid "You have successfully registered with RhodeCode" msgstr "" -#: rhodecode/apps/login/views.py:317 +#: rhodecode/apps/login/views.py:325 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:323 +#: rhodecode/apps/login/views.py:331 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:412 +#: rhodecode/apps/login/views.py:420 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:428 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:134 +#: rhodecode/apps/my_account/views/my_account.py:135 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:141 +#: rhodecode/apps/my_account/views/my_account.py:142 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:288 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:465 +#: rhodecode/apps/my_account/views/my_account.py:470 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" @@ -686,7 +787,7 @@ 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 +#: rhodecode/apps/user_group/views/__init__.py:328 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -713,28 +814,28 @@ msgstr "清除缓存时发生错误" #: 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:585 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_commits.py:192 #: 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 +#: rhodecode/apps/repository/views/repo_checks.py:98 #, python-format msgid "Created repository %s from %s" msgstr "" -#: rhodecode/apps/repository/views/repo_checks.py:104 +#: rhodecode/apps/repository/views/repo_checks.py:107 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: rhodecode/apps/repository/views/repo_checks.py:107 +#: rhodecode/apps/repository/views/repo_checks.py:110 #, python-format msgid "Created repository %s" msgstr "" @@ -763,13 +864,13 @@ msgstr "" msgid "Increase context for all diffs" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:389 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1126 +#: rhodecode/apps/repository/views/repo_commits.py:388 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1129 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:433 +#: rhodecode/apps/repository/views/repo_commits.py:432 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" @@ -851,14 +952,14 @@ 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/apps/repository/views/repo_summary.py:322 +#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 #: 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 +#: rhodecode/model/scm.py:804 rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "标签" @@ -919,12 +1020,12 @@ msgid "" "the path" msgstr "" -#: rhodecode/apps/repository/views/repo_forks.py:144 -#: rhodecode/templates/base/base.mako:262 +#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "比较复刻" -#: rhodecode/apps/repository/views/repo_forks.py:250 +#: rhodecode/apps/repository/views/repo_forks.py:251 #, python-format msgid "An error occurred during repository forking %s" msgstr "在复刻版本库 %s 的时候发生错误" @@ -933,91 +1034,88 @@ msgstr "在复刻版本库 %s 的时候发生错误" msgid "Repository permissions updated" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:636 +#: rhodecode/apps/repository/views/repo_pull_requests.py:615 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:750 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:784 +#: rhodecode/apps/repository/views/repo_pull_requests.py:775 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:798 +#: rhodecode/apps/repository/views/repo_pull_requests.py:790 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:849 +#: rhodecode/apps/repository/views/repo_pull_requests.py:841 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: rhodecode/apps/repository/views/repo_pull_requests.py:852 +#: rhodecode/apps/repository/views/repo_pull_requests.py:844 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:904 +#: rhodecode/apps/repository/views/repo_pull_requests.py:875 +#: rhodecode/apps/repository/views/repo_pull_requests.py:905 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +#: rhodecode/apps/repository/views/repo_pull_requests.py:911 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 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 +#: rhodecode/apps/repository/views/repo_pull_requests.py:946 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1008 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1010 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1032 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1034 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1057 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1060 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: rhodecode/apps/repository/views/repo_settings.py:167 +#: rhodecode/apps/repository/views/repo_settings.py:168 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:171 +#: rhodecode/apps/repository/views/repo_settings.py:172 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:193 +#: rhodecode/apps/repository/views/repo_settings.py:194 msgid "Unlocked" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:199 msgid "Locked" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:200 +#: rhodecode/apps/repository/views/repo_settings.py:201 #, python-format msgid "Repository has been %s" msgstr "版本库曾经为 %s" -#: rhodecode/apps/repository/views/repo_settings.py:204 +#: rhodecode/apps/repository/views/repo_settings.py:205 #: rhodecode/apps/repository/views/repo_settings_advanced.py:230 msgid "An error occurred during unlocking" msgstr "解锁时发生错误" -#: rhodecode/apps/repository/views/repo_settings.py:248 +#: rhodecode/apps/repository/views/repo_settings.py:249 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" @@ -1080,28 +1178,18 @@ msgstr "" msgid "Unlocked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_fields.py:85 +#: rhodecode/apps/repository/views/repo_settings_fields.py:86 msgid "An error occurred during creation of field" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_fields.py:107 +#: rhodecode/apps/repository/views/repo_settings_fields.py:108 msgid "An error occurred during removal of field" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:85 +#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86 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 "成功拉取自远程路径" @@ -1110,34 +1198,23 @@ msgstr "成功拉取自远程路径" 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 +#: rhodecode/apps/repository/views/repo_summary.py:297 msgid "Branch" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:298 msgid "Tag" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:299 msgid "Bookmark" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:322 +#: rhodecode/apps/repository/views/repo_summary.py:323 msgid "Closed branches" msgstr "" @@ -1149,41 +1226,41 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:209 +#: rhodecode/apps/user_group/views/__init__.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:231 +#: rhodecode/apps/user_group/views/__init__.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:257 +#: rhodecode/apps/user_group/views/__init__.py:232 msgid "Successfully deleted user group" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:262 +#: rhodecode/apps/user_group/views/__init__.py:237 msgid "An error occurred during deletion of user group" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:366 +#: rhodecode/apps/user_group/views/__init__.py:341 msgid "Target group cannot be the same" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:381 +#: rhodecode/apps/user_group/views/__init__.py:356 msgid "User Group permissions updated" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:452 +#: rhodecode/apps/user_group/views/__init__.py:428 msgid "User Group global permissions updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:534 +#: rhodecode/apps/user_group/views/__init__.py:510 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:538 +#: rhodecode/apps/user_group/views/__init__.py:514 msgid "An error occurred during synchronization update" msgstr "" @@ -1210,20 +1287,20 @@ msgstr "" msgid "Auth Cache TTL" msgstr "" -#: rhodecode/authentication/views.py:90 +#: rhodecode/authentication/views.py:93 msgid "" "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:176 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:170 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:181 +#: rhodecode/authentication/views.py:173 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:191 +#: rhodecode/authentication/views.py:181 msgid "Error occurred during update of auth settings." msgstr "" @@ -1348,11 +1425,11 @@ msgid "Password to authenticate for given user DN." msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:105 -#: rhodecode/integrations/types/webhook.py:214 +#: rhodecode/integrations/types/webhook.py:220 #: 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:324 +#: rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "密码" @@ -1476,56 +1553,6 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/admin/settings.py:172 -#: rhodecode/controllers/admin/settings.py:286 -msgid "Error occurred during updating application settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:226 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:282 -msgid "Updated application settings" -msgstr "更新应用设置" - -#: rhodecode/controllers/admin/settings.py:348 -msgid "Updated visualisation settings" -msgstr "成功更新可视化设置" - -#: rhodecode/controllers/admin/settings.py:351 -msgid "Error occurred during updating visualisation settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:444 -msgid "Please enter email address" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:462 -msgid "Send email task created" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:495 -msgid "Added new hook" -msgstr "新建钩子" - -#: rhodecode/controllers/admin/settings.py:510 -msgid "Updated hooks" -msgstr "更新钩子" - -#: rhodecode/controllers/admin/settings.py:514 -msgid "Error occurred during hook creation" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:643 -msgid "Error occurred during updating labs settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:648 -msgid "Updated Labs settings" -msgstr "" - #: rhodecode/events/pullrequest.py:72 msgid "pullrequest created" msgstr "" @@ -1550,35 +1577,35 @@ msgstr "" msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:149 +#: rhodecode/events/repo.py:189 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:158 +#: rhodecode/events/repo.py:198 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:167 +#: rhodecode/events/repo.py:207 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:176 +#: rhodecode/events/repo.py:216 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:216 +#: rhodecode/events/repo.py:256 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:265 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:274 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:285 msgid "repository push" msgstr "" @@ -1629,7 +1656,7 @@ msgstr "" #: 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:211 +#: rhodecode/templates/admin/settings/settings_visual.mako:215 #: 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 @@ -1657,9 +1684,9 @@ msgstr "重置" #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: 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/changeset/changeset_file_comment.mako:143 +#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:148 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1722,81 +1749,81 @@ msgstr "" msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:301 +#: rhodecode/integrations/views.py:302 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:326 +#: rhodecode/integrations/views.py:327 msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:214 +#: rhodecode/integrations/types/email.py:215 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:215 +#: rhodecode/integrations/types/email.py:216 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:220 #: rhodecode/integrations/types/email.py:221 +#: rhodecode/integrations/types/email.py:222 msgid "Email address" msgstr "" -#: rhodecode/integrations/types/email.py:233 +#: rhodecode/integrations/types/email.py:234 msgid "Send repo push summaries to a list of recipients via email" msgstr "" -#: rhodecode/integrations/types/hipchat.py:43 +#: rhodecode/integrations/types/hipchat.py:41 msgid "Yellow" msgstr "" -#: rhodecode/integrations/types/hipchat.py:44 +#: rhodecode/integrations/types/hipchat.py:42 msgid "Red" msgstr "" -#: rhodecode/integrations/types/hipchat.py:45 +#: rhodecode/integrations/types/hipchat.py:43 msgid "Green" msgstr "" -#: rhodecode/integrations/types/hipchat.py:46 +#: rhodecode/integrations/types/hipchat.py:44 msgid "Purple" msgstr "" -#: rhodecode/integrations/types/hipchat.py:47 +#: rhodecode/integrations/types/hipchat.py:45 msgid "Gray" msgstr "" -#: rhodecode/integrations/types/hipchat.py:52 +#: rhodecode/integrations/types/hipchat.py:50 msgid "Hipchat server URL" msgstr "" -#: rhodecode/integrations/types/hipchat.py:53 +#: rhodecode/integrations/types/hipchat.py:51 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:63 +#: rhodecode/integrations/types/hipchat.py:61 msgid "Notify" msgstr "" -#: rhodecode/integrations/types/hipchat.py:64 +#: rhodecode/integrations/types/hipchat.py:62 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:70 +#: rhodecode/integrations/types/hipchat.py:68 msgid "Color" msgstr "" -#: rhodecode/integrations/types/hipchat.py:71 +#: rhodecode/integrations/types/hipchat.py:69 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:99 +#: rhodecode/integrations/types/hipchat.py:97 msgid "Hipchat" msgstr "" -#: rhodecode/integrations/types/hipchat.py:100 +#: rhodecode/integrations/types/hipchat.py:98 msgid "" "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" @@ -1812,7 +1839,7 @@ msgid "" msgstr "" #: rhodecode/integrations/types/slack.py:60 -#: rhodecode/integrations/types/webhook.py:204 +#: rhodecode/integrations/types/webhook.py:210 #: 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 @@ -1823,7 +1850,7 @@ msgstr "" #: 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:315 +#: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.mako:27 @@ -1859,11 +1886,11 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:177 +#: rhodecode/integrations/types/webhook.py:183 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:179 +#: rhodecode/integrations/types/webhook.py:185 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 " @@ -1871,53 +1898,53 @@ msgid "" "unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:193 +#: rhodecode/integrations/types/webhook.py:199 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:194 +#: rhodecode/integrations/types/webhook.py:200 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 +#: rhodecode/integrations/types/webhook.py:211 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:215 +#: rhodecode/integrations/types/webhook.py:221 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:225 +#: rhodecode/integrations/types/webhook.py:231 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:226 +#: rhodecode/integrations/types/webhook.py:232 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:235 +#: rhodecode/integrations/types/webhook.py:241 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:236 +#: rhodecode/integrations/types/webhook.py:242 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:245 +#: rhodecode/integrations/types/webhook.py:251 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:246 +#: rhodecode/integrations/types/webhook.py:252 msgid "Select if the Webhook call should be made with POST or GET." msgstr "" -#: rhodecode/integrations/types/webhook.py:259 +#: rhodecode/integrations/types/webhook.py:265 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:260 +#: rhodecode/integrations/types/webhook.py:266 msgid "Post json events to a Webhook endpoint" msgstr "" @@ -2005,80 +2032,63 @@ msgstr "[开始关注]版本库" msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: rhodecode/lib/action_parser.py:171 +#: rhodecode/lib/action_parser.py:172 #, python-format msgid "fork name %s" msgstr "复刻名称 %s" -#: rhodecode/lib/action_parser.py:189 +#: rhodecode/lib/action_parser.py:191 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "拉取请求 #%s" -#: rhodecode/lib/action_parser.py:223 +#: rhodecode/lib/action_parser.py:226 #, python-format msgid "Show all combined commits %s->%s" msgstr "" -#: rhodecode/lib/action_parser.py:228 +#: rhodecode/lib/action_parser.py:231 msgid "compare view" msgstr "比较显示" -#: rhodecode/lib/action_parser.py:235 +#: rhodecode/lib/action_parser.py:238 #, python-format msgid " and %(num)s more commits" msgstr "" -#: rhodecode/lib/action_parser.py:288 +#: rhodecode/lib/action_parser.py:293 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支 %s" -#: rhodecode/lib/action_parser.py:291 +#: rhodecode/lib/action_parser.py:296 #, python-format msgid "Created tag: %s" msgstr "创建标签 %s" -#: rhodecode/lib/action_parser.py:304 +#: rhodecode/lib/action_parser.py:309 msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1445 +#: rhodecode/lib/auth.py:1441 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1535 +#: rhodecode/lib/auth.py:1531 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: rhodecode/lib/auth.py:1577 +#: rhodecode/lib/auth.py:1575 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:62 -msgid "Click to comment" -msgstr "" - -#: rhodecode/lib/diffs.py:77 -msgid "Binary file" -msgstr "" - -#: rhodecode/lib/diffs.py:98 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "修订集因过大而被截断，可查看原始修订集作为替代" - -#: rhodecode/lib/diffs.py:109 -msgid "No changes detected" -msgstr "未发现差异" - -#: rhodecode/lib/diffs.py:927 +#: rhodecode/lib/diffs.py:864 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1869 +#: rhodecode/lib/helpers.py:1855 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2098,7 +2108,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1893 +#: rhodecode/lib/helpers.py:1879 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2112,49 +2122,49 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1910 +#: rhodecode/lib/helpers.py:1896 #, 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:525 +#: rhodecode/lib/utils2.py:524 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:531 +#: rhodecode/lib/utils2.py:530 msgid "${ago} ago" msgstr "" -#: rhodecode/lib/utils2.py:540 +#: rhodecode/lib/utils2.py:539 msgid "${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:542 +#: rhodecode/lib/utils2.py:541 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:544 +#: rhodecode/lib/utils2.py:543 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:546 +#: rhodecode/lib/utils2.py:545 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:548 +#: rhodecode/lib/utils2.py:547 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:550 +#: rhodecode/lib/utils2.py:549 msgid "in ${val} and ${detail}" msgstr "" -#: 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/lib/utils2.py:553 +#: rhodecode/public/js/rhodecode-components.js:30702 +#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "刚刚" @@ -2182,6 +2192,7 @@ msgstr "刚刚" #: 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_11_0_0.py:2599 #: 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 @@ -2190,7 +2201,7 @@ msgstr "刚刚" #: 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 +#: rhodecode/model/db.py:2626 msgid "Repository no access" msgstr "无版本库访问权限" @@ -2217,6 +2228,7 @@ msgstr "无版本库访问权限" #: 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_11_0_0.py:2600 #: 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 @@ -2225,7 +2237,7 @@ msgstr "无版本库访问权限" #: 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 +#: rhodecode/model/db.py:2627 msgid "Repository read access" msgstr "版本库读取权限" @@ -2252,6 +2264,7 @@ msgstr "版本库读取权限" #: 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_11_0_0.py:2601 #: 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 @@ -2260,7 +2273,7 @@ msgstr "版本库读取权限" #: 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 +#: rhodecode/model/db.py:2628 msgid "Repository write access" msgstr "版本库写入权限" @@ -2287,6 +2300,7 @@ msgstr "版本库写入权限" #: 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_11_0_0.py:2602 #: 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 @@ -2295,7 +2309,7 @@ msgstr "版本库写入权限" #: 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 +#: rhodecode/model/db.py:2629 msgid "Repository admin access" msgstr "版本库管理权限" @@ -2362,6 +2376,7 @@ msgstr "RhodeCode 管理员" #: 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_11_0_0.py:2620 #: 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 @@ -2370,7 +2385,7 @@ msgstr "RhodeCode 管理员" #: 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 +#: rhodecode/model/db.py:2647 msgid "Repository creation disabled" msgstr "禁用创建版本库" @@ -2397,6 +2412,7 @@ msgstr "禁用创建版本库" #: 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_11_0_0.py:2621 #: 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 @@ -2405,7 +2421,7 @@ msgstr "禁用创建版本库" #: 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 +#: rhodecode/model/db.py:2648 msgid "Repository creation enabled" msgstr "允许创建版本库" @@ -2432,6 +2448,7 @@ msgstr "允许创建版本库" #: 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_11_0_0.py:2625 #: 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 @@ -2440,7 +2457,7 @@ msgstr "允许创建版本库" #: 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 +#: rhodecode/model/db.py:2652 msgid "Repository forking disabled" msgstr "禁用复刻版本库" @@ -2467,6 +2484,7 @@ msgstr "禁用复刻版本库" #: 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_11_0_0.py:2626 #: 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 @@ -2475,7 +2493,7 @@ msgstr "禁用复刻版本库" #: 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 +#: rhodecode/model/db.py:2653 msgid "Repository forking enabled" msgstr "允许复刻版本库" @@ -2523,6 +2541,7 @@ msgstr "用自动激活注册新用户" #: 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_11_0_0.py:3328 #: 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 @@ -2531,7 +2550,11 @@ msgstr "用自动激活注册新用户" #: 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 +#: rhodecode/model/db.py:3355 +#: rhodecode/public/js/rhodecode-components.js:48211 +#: rhodecode/public/js/scripts.js:40015 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 msgid "Not Reviewed" msgstr "未检视" @@ -2558,6 +2581,7 @@ msgstr "未检视" #: 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_11_0_0.py:3329 #: 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 @@ -2566,7 +2590,7 @@ msgstr "未检视" #: 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 +#: rhodecode/model/db.py:3356 msgid "Approved" msgstr "已批准" @@ -2593,6 +2617,7 @@ msgstr "已批准" #: 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_11_0_0.py:3330 #: 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 @@ -2601,7 +2626,7 @@ msgstr "已批准" #: 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 +#: rhodecode/model/db.py:3357 msgid "Rejected" msgstr "驳回" @@ -2628,6 +2653,7 @@ msgstr "驳回" #: 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_11_0_0.py:3331 #: 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 @@ -2636,7 +2662,7 @@ msgstr "驳回" #: 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 +#: rhodecode/model/db.py:3358 msgid "Under Review" msgstr "检视中" @@ -2660,6 +2686,7 @@ msgstr "检视中" #: 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_11_0_0.py:2604 #: 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 @@ -2668,7 +2695,7 @@ msgstr "检视中" #: 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 +#: rhodecode/model/db.py:2631 msgid "Repository group no access" msgstr "" @@ -2692,6 +2719,7 @@ msgstr "" #: 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_11_0_0.py:2605 #: 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 @@ -2700,7 +2728,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2632 msgid "Repository group read access" msgstr "" @@ -2724,6 +2752,7 @@ msgstr "" #: 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_11_0_0.py:2606 #: 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 @@ -2732,7 +2761,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2633 msgid "Repository group write access" msgstr "" @@ -2756,6 +2785,7 @@ msgstr "" #: 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_11_0_0.py:2607 #: 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 @@ -2764,7 +2794,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2634 msgid "Repository group admin access" msgstr "" @@ -2787,6 +2817,7 @@ msgstr "" #: 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_11_0_0.py:2609 #: 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 @@ -2795,7 +2826,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2636 msgid "User group no access" msgstr "" @@ -2818,6 +2849,7 @@ msgstr "" #: 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_11_0_0.py:2610 #: 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 @@ -2826,7 +2858,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2637 msgid "User group read access" msgstr "" @@ -2849,6 +2881,7 @@ msgstr "" #: 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_11_0_0.py:2611 #: 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 @@ -2857,7 +2890,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2638 msgid "User group write access" msgstr "" @@ -2880,6 +2913,7 @@ msgstr "" #: 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_11_0_0.py:2612 #: 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 @@ -2888,7 +2922,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2639 msgid "User group admin access" msgstr "" @@ -2911,6 +2945,7 @@ msgstr "" #: 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_11_0_0.py:2614 #: 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 @@ -2919,7 +2954,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2641 msgid "Repository Group creation disabled" msgstr "" @@ -2942,6 +2977,7 @@ msgstr "" #: 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_11_0_0.py:2615 #: 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 @@ -2950,7 +2986,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2642 msgid "Repository Group creation enabled" msgstr "" @@ -2973,6 +3009,7 @@ msgstr "" #: 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_11_0_0.py:2617 #: 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 @@ -2981,7 +3018,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2644 msgid "User Group creation disabled" msgstr "" @@ -3004,6 +3041,7 @@ msgstr "" #: 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_11_0_0.py:2618 #: 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 @@ -3012,7 +3050,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2645 msgid "User Group creation enabled" msgstr "" @@ -3035,6 +3073,7 @@ msgstr "" #: 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_11_0_0.py:2628 #: 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 @@ -3043,7 +3082,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2655 msgid "Registration disabled" msgstr "" @@ -3066,6 +3105,7 @@ msgstr "" #: 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_11_0_0.py:2629 #: 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 @@ -3074,7 +3114,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2656 msgid "User Registration with manual account activation" msgstr "" @@ -3097,6 +3137,7 @@ msgstr "" #: 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_11_0_0.py:2630 #: 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 @@ -3105,7 +3146,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2657 msgid "User Registration with automatic account activation" msgstr "" @@ -3128,6 +3169,7 @@ msgstr "" #: 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_11_0_0.py:2636 #: 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 @@ -3136,7 +3178,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2663 rhodecode/model/permission.py:96 msgid "Manual activation of external account" msgstr "" @@ -3159,6 +3201,7 @@ msgstr "" #: 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_11_0_0.py:2637 #: 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 @@ -3167,7 +3210,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2664 rhodecode/model/permission.py:97 msgid "Automatic activation of external account" msgstr "" @@ -3184,6 +3227,7 @@ msgstr "" #: 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_11_0_0.py:2622 #: 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 @@ -3192,7 +3236,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2649 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3210,6 +3254,7 @@ msgstr "" #: 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_11_0_0.py:2623 #: 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 @@ -3218,7 +3263,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2650 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3233,6 +3278,7 @@ msgstr "" #: 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_11_0_0.py:2597 #: 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 @@ -3241,7 +3287,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2624 msgid "RhodeCode Super Administrator" msgstr "" @@ -3253,6 +3299,7 @@ msgstr "" #: 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_11_0_0.py:2639 #: 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 @@ -3261,7 +3308,7 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2666 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3273,6 +3320,7 @@ msgstr "" #: 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_11_0_0.py:2640 #: 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 @@ -3281,10 +3329,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2667 msgid "Inherit object permissions from default user enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 #: 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 @@ -3293,10 +3342,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: 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 +#: rhodecode/model/db.py:1107 msgid "all" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3305,10 +3355,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: 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 +#: rhodecode/model/db.py:1108 msgid "http/web interface" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3317,10 +3368,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: 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 +#: rhodecode/model/db.py:1109 msgid "vcs (git/hg/svn protocol)" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3329,10 +3381,11 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: 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 +#: rhodecode/model/db.py:1110 msgid "api calls" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 #: 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 @@ -3341,10 +3394,11 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:1111 msgid "feed access" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 #: 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 @@ -3353,60 +3407,51 @@ msgstr "" #: 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 +#: rhodecode/model/db.py:2387 msgid "No parent" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 #: 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 +#: rhodecode/model/db.py:2659 msgid "Password reset enabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 #: 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 +#: rhodecode/model/db.py:2660 msgid "Password reset hidden" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 #: 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 +#: rhodecode/model/db.py:2661 msgid "Password reset disabled" msgstr "" -#: rhodecode/lib/index/whoosh.py:150 -msgid "Invalid search query. Try quoting it." -msgstr "错误的搜索。请尝试用引号包含它。" - -#: rhodecode/lib/index/whoosh.py:152 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "没有索引用于搜索。请运行whoosh索引器" - -#: rhodecode/lib/index/whoosh.py:157 -msgid "An error occurred during this search operation" -msgstr "在搜索操作中发生异常" - -#: rhodecode/lib/index/whoosh.py:165 +#: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" -#: rhodecode/lib/index/whoosh.py:166 +#: rhodecode/lib/index/whoosh.py:165 msgid "File Index" msgstr "" -#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172 +#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171 msgid "Indexed documents" msgstr "" -#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174 +#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173 msgid "Last update" msgstr "" -#: rhodecode/lib/index/whoosh.py:171 +#: rhodecode/lib/index/whoosh.py:170 msgid "Commit index" msgstr "" @@ -3426,28 +3471,28 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:375 +#: rhodecode/model/comment.py:382 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:376 +#: rhodecode/model/comment.py:383 msgid "Show it now" msgstr "" -#: rhodecode/model/forms.py:87 +#: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "请登录" -#: rhodecode/model/forms.py:88 +#: rhodecode/model/forms.py:89 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "输入一个不少于%(min)i个字符的值" -#: rhodecode/model/forms.py:98 +#: rhodecode/model/forms.py:99 msgid "Please enter a password" msgstr "请输入密码" -#: rhodecode/model/forms.py:99 +#: rhodecode/model/forms.py:100 #, python-format msgid "Enter %(min)i characters or more" msgstr "输入至少%(min)i个字符" @@ -3534,8 +3579,8 @@ msgstr "读" #: 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 -#: rhodecode/templates/changeset/changeset_file_comment.mako:321 +#: rhodecode/templates/changeset/changeset_file_comment.mako:272 +#: rhodecode/templates/changeset/changeset_file_comment.mako:322 msgid "Write" msgstr "写" @@ -3569,8 +3614,8 @@ 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:417 -#: rhodecode/templates/base/base.mako:424 +#: rhodecode/templates/base/base.mako:419 +#: rhodecode/templates/base/base.mako:426 msgid "Admin" msgstr "管理" @@ -3687,115 +3732,79 @@ msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1166 +#: rhodecode/model/pull_request.py:1218 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1168 +#: rhodecode/model/pull_request.py:1220 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1181 +#: rhodecode/model/pull_request.py:1233 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1200 +#: rhodecode/model/pull_request.py:1252 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1203 +#: rhodecode/model/pull_request.py:1255 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1365 rhodecode/model/scm.py:784 +#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 msgid "Bookmarks" msgstr "书签" -#: rhodecode/model/pull_request.py:1370 +#: rhodecode/model/pull_request.py:1425 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1373 +#: rhodecode/model/pull_request.py:1428 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1533 +#: rhodecode/model/pull_request.py:1588 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1546 +#: rhodecode/model/pull_request.py:1601 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1561 +#: rhodecode/model/pull_request.py:1616 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1564 +#: rhodecode/model/pull_request.py:1619 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1599 +#: rhodecode/model/pull_request.py:1654 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1604 +#: rhodecode/model/pull_request.py:1659 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1611 +#: rhodecode/model/pull_request.py:1666 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1613 +#: rhodecode/model/pull_request.py:1668 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:762 +#: rhodecode/model/scm.py:775 msgid "latest tip" msgstr "最新tip" -#: rhodecode/model/user.py:166 -msgid "You can't Edit this user since it's crucial for entire application" -msgstr "由于是系统帐号，无法编辑该用户" - -#: 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:506 -msgid "You can't remove this user since it's crucial for entire application" -msgstr "由于是系统帐号，无法删除该用户" - -#: 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: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:532 -#, python-format -msgid "" -"user \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups:%s" -msgstr "" - -#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99 +#: rhodecode/model/validators.py:92 rhodecode/model/validators.py:93 msgid "Value cannot be an empty list" msgstr "值不能为空" -#: rhodecode/model/validators.py:142 +#: rhodecode/model/validators.py:139 msgid "Pattern already exists" msgstr "" @@ -3816,30 +3825,26 @@ msgid "" "dashes and must begin with alphanumeric character or underscore" msgstr "" -#: rhodecode/model/validators.py:192 -msgid "The input is not valid" -msgstr "" - -#: rhodecode/model/validators.py:199 +#: rhodecode/model/validators.py:195 #, python-format msgid "Username %(username)s is not valid" msgstr "用户名称 %(username)s 无效" -#: rhodecode/model/validators.py:200 +#: rhodecode/model/validators.py:196 #, python-format msgid "Username %(username)s is disabled" msgstr "" -#: rhodecode/model/validators.py:223 +#: rhodecode/model/validators.py:221 msgid "Invalid user group name" msgstr "" -#: rhodecode/model/validators.py:224 +#: rhodecode/model/validators.py:222 #, python-format msgid "User group `%(usergroup)s` already exists" msgstr "" -#: rhodecode/model/validators.py:226 +#: rhodecode/model/validators.py:224 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -3867,166 +3872,166 @@ msgstr "" msgid "no permission to store repository group in root location" msgstr "" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:387 msgid "Invalid characters (non-ascii) in password" msgstr "密码含有无效（非ASCII）字符" -#: rhodecode/model/validators.py:401 -msgid "Invalid old password" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:406 msgid "Passwords do not match" msgstr "密码不符" -#: rhodecode/model/validators.py:436 +#: rhodecode/model/validators.py:426 msgid "invalid password" msgstr "无效密码" -#: rhodecode/model/validators.py:437 +#: rhodecode/model/validators.py:427 msgid "invalid user name" msgstr "无效用户名" -#: rhodecode/model/validators.py:438 +#: rhodecode/model/validators.py:428 msgid "Your account is disabled" msgstr "该帐号已被禁用" -#: rhodecode/model/validators.py:470 -msgid "Token mismatch" -msgstr "令牌不匹配" - -#: rhodecode/model/validators.py:484 +#: rhodecode/model/validators.py:464 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "版本库名称不能为 %(repo)s" -#: rhodecode/model/validators.py:486 +#: rhodecode/model/validators.py:466 #, python-format msgid "Repository with name %(repo)s already exists" msgstr "" -#: rhodecode/model/validators.py:488 +#: rhodecode/model/validators.py:468 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:491 +#: rhodecode/model/validators.py:471 #, python-format msgid "Repository with name %(repo)s exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:493 +#: rhodecode/model/validators.py:473 #, python-format msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:566 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219 msgid "Repository name cannot end with .git" msgstr "" -#: rhodecode/model/validators.py:640 +#: rhodecode/model/validators.py:626 #, python-format msgid "invalid clone url for %(rtype)s repository" msgstr "" -#: rhodecode/model/validators.py:641 +#: rhodecode/model/validators.py:627 #, python-format msgid "" "Invalid clone url, provide a valid clone url starting with one of " "%(allowed_prefixes)s" msgstr "" -#: rhodecode/model/validators.py:670 +#: rhodecode/model/validators.py:659 msgid "Fork have to be the same type as parent" msgstr "复刻版本库必须和父版本库类型相同" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:676 msgid "You do not have the permission to create repositories in this group." msgstr "" -#: rhodecode/model/validators.py:688 +#: rhodecode/model/validators.py:679 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125 msgid "" "You do not have the permission to store repositories in the root location." msgstr "" -#: rhodecode/model/validators.py:748 +#: rhodecode/model/validators.py:739 msgid "This username or user group name is not valid" msgstr "" -#: rhodecode/model/validators.py:879 +#: rhodecode/model/validators.py:852 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: rhodecode/model/validators.py:894 +#: rhodecode/model/validators.py:870 msgid "This e-mail address is already taken" msgstr "该邮件地址已被使用" -#: rhodecode/model/validators.py:914 +#: rhodecode/model/validators.py:892 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "邮件地址\"%(email)s\"不存在" -#: rhodecode/model/validators.py:935 +#: rhodecode/model/validators.py:913 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "修订 %(revs)s 已经包含在拉取请求中或者或者已经设置状态" -#: rhodecode/model/validators.py:966 -#: rhodecode/model/validation_schema/validators.py:40 -#: rhodecode/model/validation_schema/validators.py:53 +#: rhodecode/model/validators.py:946 +#: rhodecode/model/validation_schema/validators.py:41 +#: rhodecode/model/validation_schema/validators.py:54 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:967 +#: rhodecode/model/validators.py:947 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:994 +#: rhodecode/model/validators.py:975 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: rhodecode/model/validators.py:1009 +#: rhodecode/model/validators.py:992 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: rhodecode/model/validators.py:1012 +#: rhodecode/model/validators.py:995 #, python-format msgid "The plugin \"%(plugin_id)s\" is missing an includeme function." msgstr "" -#: rhodecode/model/validators.py:1015 +#: rhodecode/model/validators.py:998 #, python-format msgid "Can not load plugin \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validators.py:1017 +#: rhodecode/model/validators.py:1000 #, python-format msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" -#: rhodecode/model/validation_schema/validators.py:61 +#: rhodecode/model/validators.py:1068 +msgid "Url must start with http or /" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:62 msgid "Invalid glob pattern" msgstr "" -#: rhodecode/model/validation_schema/validators.py:70 +#: rhodecode/model/validation_schema/validators.py:71 msgid "Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/validators.py:132 +#: rhodecode/model/validation_schema/validators.py:133 msgid "" "Invalid clone url, provide a valid clone url starting with one of " "{allowed_prefixes}" msgstr "" -#: rhodecode/model/validation_schema/validators.py:138 +#: rhodecode/model/validation_schema/validators.py:139 msgid "invalid clone url for {repo_type} repository" msgstr "" +#: rhodecode/model/validation_schema/validators.py:148 +msgid "Please enter a valid json object" +msgstr "" + #: rhodecode/model/validation_schema/schemas/comment_schema.py:42 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" @@ -4075,35 +4080,35 @@ msgstr "" msgid "Integration scope" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 msgid "General integration options" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:220 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:47 -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:51 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 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:113 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 #: 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:136 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4143,451 +4148,451 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: 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/rhodecode-components.js:28706 +#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: 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/rhodecode-components.js:30637 +#: rhodecode/public/js/scripts.js:22485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: 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/rhodecode-components.js:30638 +#: rhodecode/public/js/scripts.js:22486 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: 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/rhodecode-components.js:30639 +#: rhodecode/public/js/scripts.js:22487 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: 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/rhodecode-components.js:30640 +#: rhodecode/public/js/scripts.js:22488 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: 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/rhodecode-components.js:30641 +#: rhodecode/public/js/scripts.js:22489 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: 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/rhodecode-components.js:30642 +#: rhodecode/public/js/scripts.js:22490 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: 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/rhodecode-components.js:30662 +#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: 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/rhodecode-components.js:30670 +#: rhodecode/public/js/scripts.js:22518 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: 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/rhodecode-components.js:30682 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: 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/rhodecode-components.js:30684 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: 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/rhodecode-components.js:30688 +#: rhodecode/public/js/scripts.js:22536 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: 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/rhodecode-components.js:30690 +#: rhodecode/public/js/scripts.js:22538 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: 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/rhodecode-components.js:30692 +#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: 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-components.js:44751 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: 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-components.js:44754 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: 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-components.js:44757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: 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-components.js:44760 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: 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-components.js:44764 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: 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:43213 -#: rhodecode/public/js/scripts.js:35061 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:44766 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 #: 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:43218 -#: rhodecode/public/js/scripts.js:35066 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +#: rhodecode/public/js/rhodecode-components.js:44771 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: 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-components.js:44773 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: 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-components.js:44778 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: 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-components.js:44780 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: 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-components.js:44784 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: 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-components.js:44786 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: 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/rhodecode-components.js:45724 +#: rhodecode/public/js/scripts.js:37528 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: 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/rhodecode-components.js:45726 +#: rhodecode/public/js/scripts.js:37530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: 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/rhodecode-components.js:46172 +#: rhodecode/public/js/scripts.js:37976 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/codemirror.js:297 msgid "Set status to Approved" msgstr "" -#: 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/rhodecode-components.js:46191 +#: rhodecode/public/js/scripts.js:37995 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 #: rhodecode/public/js/src/rhodecode/codemirror.js:316 msgid "Set status to Rejected" msgstr "" -#: 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/rhodecode-components.js:46210 +#: rhodecode/public/js/scripts.js:38014 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:44673 -#: rhodecode/public/js/scripts.js:36521 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:46230 +#: rhodecode/public/js/scripts.js:38034 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/codemirror.js:355 msgid "Note Comment" msgstr "" -#: 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/rhodecode-components.js:46597 +#: rhodecode/public/js/scripts.js:38401 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/rhodecode/comments.js:126 msgid "resolve comment" msgstr "" -#: 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/rhodecode-components.js:46681 +#: rhodecode/public/js/scripts.js:38485 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/comments.js:210 msgid "Status Review" msgstr "" -#: 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/rhodecode-components.js:46696 +#: rhodecode/public/js/scripts.js:38500 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: 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:45296 -#: rhodecode/public/js/scripts.js:37144 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:46853 +#: rhodecode/public/js/scripts.js:38657 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/rhodecode/comments.js:382 msgid "Submitting..." msgstr "提交中……" -#: 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/rhodecode-components.js:46904 +#: rhodecode/public/js/scripts.js:38708 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 #: 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:45452 -#: rhodecode/public/js/scripts.js:37300 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 -#: rhodecode/public/js/src/rhodecode/comments.js:538 +#: rhodecode/public/js/rhodecode-components.js:47014 +#: rhodecode/public/js/scripts.js:38818 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/comments.js:543 msgid "Delete this comment?" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47084 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/src/rhodecode/comments.js:613 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47161 +#: rhodecode/public/js/scripts.js:38965 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 +#: rhodecode/public/js/src/rhodecode/comments.js:690 msgid "Leave a comment on line {0}." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:47275 +#: rhodecode/public/js/scripts.js:39079 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/comments.js:804 msgid "TODO from comment {0} was fixed." msgstr "" -#: 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/rhodecode-components.js:47455 +#: rhodecode/public/js/scripts.js:39259 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: 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/rhodecode-components.js:47457 +#: rhodecode/public/js/scripts.js:39261 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: 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/rhodecode-components.js:47466 +#: rhodecode/public/js/scripts.js:39270 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: 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/rhodecode-components.js:47601 +#: rhodecode/public/js/scripts.js:39405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "选择链接" -#: 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/rhodecode-components.js:47641 +#: rhodecode/public/js/scripts.js:39445 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "停止关注该版本库" -#: 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/rhodecode-components.js:47642 +#: rhodecode/public/js/scripts.js:39446 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: 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/rhodecode-components.js:47651 +#: rhodecode/public/js/scripts.js:39455 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "开始关注该版本库" -#: 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/rhodecode-components.js:47652 +#: rhodecode/public/js/scripts.js:39456 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: 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/rhodecode-components.js:48032 +#: rhodecode/public/js/scripts.js:39836 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: 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:46510 -#: rhodecode/public/js/scripts.js:38358 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:48041 +#: rhodecode/public/js/scripts.js:39845 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 +msgid "All individual reviewers must vote." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48046 +#: rhodecode/public/js/scripts.js:39850 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: 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/rhodecode-components.js:48052 +#: rhodecode/public/js/scripts.js:39856 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48068 +#: rhodecode/public/js/scripts.js:39872 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46530 -#: rhodecode/public/js/scripts.js:38378 +#: rhodecode/public/js/rhodecode-components.js:48075 +#: rhodecode/public/js/scripts.js:39879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:168 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48082 +#: rhodecode/public/js/scripts.js:39886 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48096 +#: rhodecode/public/js/scripts.js:39900 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48198 +#: rhodecode/public/js/scripts.js:40002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:300 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46823 -#: rhodecode/public/js/scripts.js:38671 +#: rhodecode/public/js/rhodecode-components.js:48204 +#: rhodecode/public/js/scripts.js:40008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:461 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:306 +msgid "User `{0}` already in reviewers" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48334 +#: rhodecode/public/js/scripts.js:40138 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:436 msgid "added manually by \"{0}\"" msgstr "" -#: 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 +#: rhodecode/public/js/rhodecode-components.js:48338 +#: rhodecode/public/js/scripts.js:40142 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:440 msgid "member of \"{0}\"" msgstr "" -#: 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/rhodecode-components.js:48924 +#: rhodecode/public/js/scripts.js:40728 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: 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/rhodecode-components.js:48944 +#: rhodecode/public/js/scripts.js:40748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: 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 +#: rhodecode/public/js/rhodecode-components.js:49356 +#: rhodecode/public/js/scripts.js:41160 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/src/rhodecode.js:574 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 +#: rhodecode/public/js/rhodecode-components.js:49364 +#: rhodecode/public/js/scripts.js:41168 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/src/rhodecode.js:582 msgid "Specified expiration date" msgstr "" @@ -4596,174 +4601,180 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:488 -#: rhodecode/templates/codeblocks/diffs.mako:493 +#: rhodecode/templates/codeblocks/diffs.mako:494 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Add another comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 msgid "Diff to Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +msgid "" +"Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 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/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "No branches available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 msgid "No forks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 msgid "No gists available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 msgid "No repositories available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 msgid "No repository groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 msgid "No ssh keys available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 msgid "No tags available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 msgid "No user groups available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "No users available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/templates/changelog/changelog.mako:59 msgid "Open new pull request" msgstr "新建拉取请求" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: 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:52 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 msgid "" "There are currently no open pull requests requiring your participation." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 msgid "Updating..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "disabled" msgstr "禁用" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/templates/admin/auth/auth_settings.mako:71 msgid "enabled" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 msgid "files" msgstr "文件" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/templates/pullrequests/pullrequest.mako:140 msgid "loading..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 msgid "{0} days" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 msgid "{0} out of {1} ssh keys" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 msgid "{0} years" msgstr "" @@ -4837,12 +4848,17 @@ msgstr "" msgid "Edit Repository Group" msgstr "" -#: rhodecode/templates/index_base.mako:97 -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:68 +msgid "No repositories or repositories groups exists here." +msgstr "" + +#: rhodecode/templates/index_base.mako:86 +#: rhodecode/templates/index_base.mako:116 #: rhodecode/templates/admin/gists/index.mako:112 #: 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_user_group_membership.mako:39 #: 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 @@ -4859,13 +4875,14 @@ msgstr "" msgid "Name" msgstr "名称" -#: rhodecode/templates/index_base.mako:100 -#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/index_base.mako:89 +#: rhodecode/templates/index_base.mako:119 #: 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/my_account/my_account_user_group_membership.mako:44 #: 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:55 @@ -4895,20 +4912,21 @@ msgstr "名称" #: rhodecode/templates/forks/forks.mako:72 #: rhodecode/templates/pullrequests/pullrequest.mako:54 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 -#: rhodecode/templates/summary/components.mako:82 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "描述" -#: rhodecode/templates/index_base.mako:103 -#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/index_base.mako:92 +#: rhodecode/templates/index_base.mako:122 #: 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/index_base.mako:94 +#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:63 @@ -4920,11 +4938,11 @@ msgstr "最后修改" #: rhodecode/templates/admin/user_groups/user_groups.mako:71 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 #: rhodecode/templates/forks/forks.mako:68 -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:209 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.mako:134 +#: rhodecode/templates/index_base.mako:125 #: 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 @@ -4936,7 +4954,7 @@ msgstr "所有者" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4953,7 +4971,7 @@ msgid "Home" msgstr "首页" #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35 -#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:341 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:343 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "登录" @@ -4977,7 +4995,7 @@ msgstr "" #: rhodecode/templates/login.mako:68 #: rhodecode/templates/password_reset.mako:37 -#: rhodecode/templates/base/base.mako:46 +#: rhodecode/templates/base/base.mako:48 #: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "" @@ -5132,7 +5150,7 @@ msgid "Repository" msgstr "版本库" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:75 +#: rhodecode/templates/base/base.mako:77 msgid "Admin audit logs" msgstr "" @@ -5319,7 +5337,7 @@ 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/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/codeblocks/diffs.mako:70 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 @@ -5393,7 +5411,7 @@ msgstr "" #: 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:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5496,8 +5514,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:46 #: 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:249 +#: rhodecode/templates/base/base.mako:86 +#: rhodecode/templates/base/base.mako:251 msgid "Settings" msgstr "设置" @@ -5600,7 +5618,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:355 +#: rhodecode/templates/base/base.mako:357 msgid "My account" msgstr "我的账户" @@ -5628,35 +5646,40 @@ msgstr "" msgid "SSH Keys" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:36 -msgid "OAuth Identities" +#: rhodecode/templates/admin/my_account/my_account.mako:33 +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5 +msgid "User Group Membership" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:38 +msgid "OAuth Identities" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account.mako:40 #: rhodecode/templates/admin/users/user_edit.mako:44 msgid "Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "Watched" msgstr "关注的" -#: rhodecode/templates/admin/my_account/my_account.mako:41 +#: rhodecode/templates/admin/my_account/my_account.mako:43 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:43 -#: rhodecode/templates/base/base.mako:239 +#: rhodecode/templates/base/base.mako:241 msgid "Pull Requests" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.mako:42 +#: rhodecode/templates/admin/my_account/my_account.mako:44 #: 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 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 -#: rhodecode/templates/base/base.mako:80 +#: rhodecode/templates/base/base.mako:82 msgid "Permissions" msgstr "权限" -#: rhodecode/templates/admin/my_account/my_account.mako:43 +#: rhodecode/templates/admin/my_account/my_account.mako:45 msgid "Live Notifications" msgstr "" @@ -5882,6 +5905,23 @@ msgid "" "sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +msgid "Click add to use this generate SSH key" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 +#: 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: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 +#: rhodecode/templates/admin/users/users.mako:74 +msgid "Active" +msgstr "启用" + #: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" @@ -6095,8 +6135,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:77 -#: rhodecode/templates/base/base.mako:151 +#: rhodecode/templates/base/base.mako:79 +#: rhodecode/templates/base/base.mako:153 msgid "Repository groups" msgstr "" @@ -6285,7 +6325,7 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:196 +#: rhodecode/templates/base/base.mako:198 msgid "Clone from" msgstr "克隆自" @@ -6365,7 +6405,7 @@ msgid "Remote" msgstr "远程" #: rhodecode/templates/admin/repos/repo_edit.mako:72 -#: rhodecode/templates/summary/components.mako:143 +#: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "统计" @@ -6390,100 +6430,104 @@ msgstr "" msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9 +msgid "Attached scoped tokens" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:25 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37 msgid "Set" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:40 msgid "Manually set this repository as a fork of another from the list" msgstr "从列表中手动设置这个版本库复刻自另一版本库" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:49 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65 msgid "" "All actions made on this repository will be visible to everyone following " "the public journal." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 msgid "" "Force repository locking. This only works when anonymous access is disabled." " Pulling from the repository locks the repository to that user until the " "same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 #: rhodecode/templates/data_table/_dt_elements.mako:172 #, python-format msgid "Confirm to delete this repository: %s" msgstr "确认删除版本库：%s" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146 msgid "" "This repository will be renamed in a special way in order to make it " "inaccessible to RhodeCode Enterprise and its VCS systems. If you need to " @@ -6491,11 +6535,11 @@ msgid "" "rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" @@ -6543,17 +6587,6 @@ msgstr "前缀" msgid "Key" 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: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 -#: rhodecode/templates/admin/users/users.mako:74 -msgid "Active" -msgstr "启用" - #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" @@ -6715,7 +6748,7 @@ msgid "Settings for Repository: %s" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 -msgid "Non-changeable id" +msgid "permalink id" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 @@ -6910,7 +6943,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:210 +#: rhodecode/templates/admin/settings/settings_visual.mako:214 msgid "Save settings" msgstr "保存设置" @@ -7204,6 +7237,14 @@ msgstr "" msgid "Gunicorn process management" msgstr "" +#: rhodecode/templates/admin/settings/settings_process_management.mako:11 +msgid "start auto refresh" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_process_management.mako:12 +msgid "stop auto refresh" +msgstr "" + #: rhodecode/templates/admin/settings/settings_search.mako:3 msgid "RhodeCode Full Text Search" msgstr "" @@ -7254,13 +7295,6 @@ msgstr "" msgid "Cleanup sessions" msgstr "" -#: rhodecode/templates/admin/settings/settings_supervisor_tail.mako:1 -#, python-format -msgid "" -"Last %(size)s bytes of process logs, use ?offset=[num] GET param to set " -"custom size" -msgstr "" - #: rhodecode/templates/admin/settings/settings_system.mako:11 msgid "create summary snapshot" msgstr "" @@ -7416,24 +7450,26 @@ msgid "" msgstr "" #: rhodecode/templates/admin/settings/settings_visual.mako:170 -msgid "Clone URL" +msgid "Clone URL templates" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:179 +#: rhodecode/templates/admin/settings/settings_visual.mako:181 msgid "" "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" " {scheme} 'http' or 'https' sent from running RhodeCode server,\n" " {user} current user username,\n" +" {sys_user} current system user running this process, usefull for ssh,\n" +" {hostname} hostname of this server running RhodeCode,\n" " {netloc} network location/server host of running RhodeCode server,\n" " {repo} full repository name,\n" " {repoid} ID of repository, can be used to contruct clone-by-id" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:192 +#: rhodecode/templates/admin/settings/settings_visual.mako:196 msgid "Custom Support Link" msgstr "" -#: rhodecode/templates/admin/settings/settings_visual.mako:200 +#: rhodecode/templates/admin/settings/settings_visual.mako:204 #, python-format msgid "" "Custom url for the support link located at the bottom.\n" @@ -7448,8 +7484,8 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:79 -#: rhodecode/templates/base/base.mako:154 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:156 msgid "User groups" msgstr "" @@ -7597,7 +7633,7 @@ msgstr "添加用户" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:78 +#: rhodecode/templates/base/base.mako:80 msgid "Users" msgstr "用户" @@ -7861,13 +7897,17 @@ msgstr "" msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:23 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:25 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" +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 +msgid "Use this generated key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +msgid "Confirmation required on the next screen" msgstr "" #: rhodecode/templates/admin/users/users.mako:5 @@ -7878,174 +7918,174 @@ msgstr "用户管理" msgid "Auth type" msgstr "" -#: rhodecode/templates/base/base.mako:53 +#: rhodecode/templates/base/base.mako:55 #, python-format msgid "RhodeCode instance id: %s" msgstr "" -#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:83 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:83 +#: rhodecode/templates/base/base.mako:85 msgid "Defaults" msgstr "默认设置" -#: rhodecode/templates/base/base.mako:101 +#: rhodecode/templates/base/base.mako:103 #: rhodecode/templates/files/files_pjax.mako:24 #: rhodecode/templates/summary/components.mako:42 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:188 +#: rhodecode/templates/base/base.mako:190 msgid "Fork of" msgstr "复刻自" -#: rhodecode/templates/base/base.mako:205 +#: rhodecode/templates/base/base.mako:207 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:210 +#: rhodecode/templates/base/base.mako:212 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:228 +#: rhodecode/templates/base/base.mako:230 #: 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/base/base.mako:231 #: 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/base/base.mako:232 #: 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:231 +#: rhodecode/templates/base/base.mako:233 #: 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:235 +#: rhodecode/templates/base/base.mako:237 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:245 +#: rhodecode/templates/base/base.mako:247 msgid "Options" msgstr "选项" -#: rhodecode/templates/base/base.mako:253 +#: rhodecode/templates/base/base.mako:255 #: 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/base/base.mako:269 +#: rhodecode/templates/base/base.mako:413 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "搜索" -#: rhodecode/templates/base/base.mako:271 +#: rhodecode/templates/base/base.mako:273 msgid "Unlock" msgstr "" -#: rhodecode/templates/base/base.mako:273 +#: rhodecode/templates/base/base.mako:275 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.mako:278 +#: rhodecode/templates/base/base.mako:280 #: rhodecode/templates/data_table/_dt_elements.mako:61 #: rhodecode/templates/data_table/_dt_elements.mako:62 msgid "Fork" msgstr "复刻" -#: rhodecode/templates/base/base.mako:279 +#: rhodecode/templates/base/base.mako:281 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:303 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:309 +#: rhodecode/templates/base/base.mako:311 #: rhodecode/templates/debug_style/login.html:28 msgid "Sign in to your account" msgstr "" -#: rhodecode/templates/base/base.mako:326 +#: rhodecode/templates/base/base.mako:328 #: rhodecode/templates/debug_style/login.html:46 msgid "(Forgot password?)" msgstr "" -#: rhodecode/templates/base/base.mako:336 +#: rhodecode/templates/base/base.mako:338 msgid "Don't have an account?" msgstr "" -#: rhodecode/templates/base/base.mako:338 +#: rhodecode/templates/base/base.mako:340 msgid "Using external auth? Sign In here." msgstr "" -#: rhodecode/templates/base/base.mako:357 +#: rhodecode/templates/base/base.mako:359 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:361 +#: rhodecode/templates/base/base.mako:363 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:393 +#: rhodecode/templates/base/base.mako:395 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:394 +#: rhodecode/templates/base/base.mako:396 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:15 msgid "Journal" msgstr "日志" -#: rhodecode/templates/base/base.mako:399 +#: rhodecode/templates/base/base.mako:401 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:400 +#: rhodecode/templates/base/base.mako:402 msgid "Public journal" msgstr "公共日志" -#: rhodecode/templates/base/base.mako:405 +#: rhodecode/templates/base/base.mako:407 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:408 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:412 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:416 +#: rhodecode/templates/base/base.mako:418 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:423 +#: rhodecode/templates/base/base.mako:425 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:433 -#: rhodecode/templates/base/base.mako:434 +#: rhodecode/templates/base/base.mako:435 +#: rhodecode/templates/base/base.mako:436 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8067,15 +8107,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:491 +#: rhodecode/templates/base/base.mako:493 msgid "Go to" msgstr "" -#: rhodecode/templates/base/base.mako:544 +#: rhodecode/templates/base/base.mako:546 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:554 msgid "Site-wide shortcuts" msgstr "" @@ -8182,8 +8222,8 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:274 -#: rhodecode/templates/changeset/changeset_file_comment.mako:324 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:325 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8528,10 +8568,10 @@ msgid "Compare Selected Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks_data.mako:13 -#: rhodecode/templates/changelog/changelog_elements.mako:115 +#: rhodecode/templates/changelog/changelog_elements.mako:121 #: rhodecode/templates/changeset/changeset.mako:115 #: rhodecode/templates/files/base.mako:10 -#: rhodecode/templates/summary/summary_commits.mako:62 +#: rhodecode/templates/summary/summary_commits.mako:68 #, python-format msgid "Bookmark %s" msgstr "" @@ -8550,10 +8590,10 @@ msgid "Compare Selected Branches" msgstr "" #: rhodecode/templates/branches/branches_data.mako:12 -#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changelog/changelog_elements.mako:113 #: rhodecode/templates/changeset/changeset.mako:128 #: rhodecode/templates/files/base.mako:23 -#: rhodecode/templates/summary/summary_commits.mako:76 +#: rhodecode/templates/summary/summary_commits.mako:82 #, python-format msgid "Branch %s" msgstr "" @@ -8618,79 +8658,79 @@ msgstr "没有任何变更" msgid "load previous" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:26 -#: rhodecode/templates/summary/summary_commits.mako:21 +#: rhodecode/templates/changelog/changelog_elements.mako:32 +#: rhodecode/templates/summary/summary_commits.mako:27 #, python-format msgid "" "Commit status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:30 -#: rhodecode/templates/summary/summary_commits.mako:25 +#: rhodecode/templates/changelog/changelog_elements.mako:36 +#: rhodecode/templates/summary/summary_commits.mako:31 msgid "Commit status: {}" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:36 -#: rhodecode/templates/summary/summary_commits.mako:31 +#: rhodecode/templates/changelog/changelog_elements.mako:42 +#: rhodecode/templates/summary/summary_commits.mako:37 msgid "Commit status: Not Reviewed" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:41 -#: rhodecode/templates/summary/summary_commits.mako:36 +#: rhodecode/templates/changelog/changelog_elements.mako:47 +#: rhodecode/templates/summary/summary_commits.mako:42 msgid "Commit has comments" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:52 +#: rhodecode/templates/changelog/changelog_elements.mako:58 #: rhodecode/templates/changeset/changeset.mako:42 msgid "Copy the full commit id" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:59 +#: rhodecode/templates/changelog/changelog_elements.mako:65 #: rhodecode/templates/changeset/changeset.mako:44 msgid "Commit phase" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:72 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: rhodecode/templates/changeset/changeset.mako:50 #: rhodecode/templates/changeset/changeset.mako:57 msgid "Evolve State" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:66 +#: rhodecode/templates/changelog/changelog_elements.mako:72 #: rhodecode/templates/changeset/changeset.mako:50 msgid "obsolete" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:73 +#: rhodecode/templates/changelog/changelog_elements.mako:79 #: 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/changelog/changelog_elements.mako:83 +#: rhodecode/templates/compare/compare_commits.mako:50 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:101 +#: rhodecode/templates/changelog/changelog_elements.mako:107 #: rhodecode/templates/changeset/changeset.mako:109 #: rhodecode/templates/files/base.mako:4 msgid "merge" msgstr "合并" -#: rhodecode/templates/changelog/changelog_elements.mako:123 +#: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 -#: rhodecode/templates/summary/summary_commits.mako:69 +#: rhodecode/templates/summary/summary_commits.mako:75 #: rhodecode/templates/tags/tags_data.mako:12 #, python-format msgid "Tag %s" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:137 +#: rhodecode/templates/changelog/changelog_elements.mako:143 msgid "load next" msgstr "" @@ -8725,7 +8765,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:81 +#: rhodecode/templates/changeset/changeset_file_comment.mako:82 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8741,8 +8781,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:445 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:451 +#: rhodecode/templates/codeblocks/diffs.mako:454 msgid "Raw diff" msgstr "" @@ -8759,8 +8799,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:452 -#: rhodecode/templates/codeblocks/diffs.mako:455 +#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:461 msgid "Download diff" msgstr "" @@ -8784,103 +8824,103 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:32 +#: rhodecode/templates/changeset/changeset_file_comment.mako:33 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:39 +#: rhodecode/templates/changeset/changeset_file_comment.mako:40 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:66 -#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:67 +#: rhodecode/templates/changeset/changeset_file_comment.mako:69 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:73 +#: rhodecode/templates/changeset/changeset_file_comment.mako:74 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:88 +#: rhodecode/templates/changeset/changeset_file_comment.mako:89 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:96 +#: rhodecode/templates/changeset/changeset_file_comment.mako:97 msgid "Pull request author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 +#: rhodecode/templates/changeset/changeset_file_comment.mako:98 msgid "author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:105 +#: rhodecode/templates/changeset/changeset_file_comment.mako:106 msgid "Outdated comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:109 -#: rhodecode/templates/changeset/changeset_file_comment.mako:124 +#: rhodecode/templates/changeset/changeset_file_comment.mako:110 +#: rhodecode/templates/changeset/changeset_file_comment.mako:125 msgid "Comment from pull request version {0}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:121 +#: rhodecode/templates/changeset/changeset_file_comment.mako:122 msgid "Outdated comment from pull request version {}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:151 -#: rhodecode/templates/changeset/changeset_file_comment.mako:154 -msgid "Prev" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:152 #: rhodecode/templates/changeset/changeset_file_comment.mako:155 +msgid "Prev" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:153 +#: rhodecode/templates/changeset/changeset_file_comment.mako:156 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:191 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:193 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:195 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:282 -#: 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:65 +msgid "You need to be logged in to leave comments." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:65 msgid "Login now" msgstr "现在登陆" -#: rhodecode/templates/changeset/changeset_file_comment.mako:348 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:351 msgid "" "Use @username inside this text to send notification to this RhodeCode user" msgstr "在文本中使用 @用户名 以发送通知到该RhodeCode用户" -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 +#: rhodecode/templates/changeset/changeset_file_comment.mako:352 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:368 +#: rhodecode/templates/changeset/changeset_file_comment.mako:369 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15 #: rhodecode/templates/pullrequests/pullrequest_show.mako:159 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "已关闭" -#: rhodecode/templates/changeset/changeset_file_comment.mako:398 +#: rhodecode/templates/changeset/changeset_file_comment.mako:399 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8977,71 +9017,71 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:290 msgid "" "File was deleted in this version, and outdated comments were made on it" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:350 +#: rhodecode/templates/codeblocks/diffs.mako:356 #: 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 +#: rhodecode/templates/codeblocks/diffs.mako:421 +#: rhodecode/templates/codeblocks/diffs.mako:437 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:417 -#: rhodecode/templates/codeblocks/diffs.mako:424 +#: rhodecode/templates/codeblocks/diffs.mako:423 +#: rhodecode/templates/codeblocks/diffs.mako:430 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:422 -#: rhodecode/templates/codeblocks/diffs.mako:438 +#: rhodecode/templates/codeblocks/diffs.mako:428 +#: rhodecode/templates/codeblocks/diffs.mako:444 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:433 -#: rhodecode/templates/codeblocks/diffs.mako:440 +#: rhodecode/templates/codeblocks/diffs.mako:439 +#: rhodecode/templates/codeblocks/diffs.mako:446 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:471 +#: rhodecode/templates/codeblocks/diffs.mako:477 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:643 +#: rhodecode/templates/codeblocks/diffs.mako:649 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:651 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:649 +#: rhodecode/templates/codeblocks/diffs.mako:655 msgid "View unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:650 +#: rhodecode/templates/codeblocks/diffs.mako:656 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:660 +#: rhodecode/templates/codeblocks/diffs.mako:666 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:664 +#: rhodecode/templates/codeblocks/diffs.mako:670 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:668 +#: rhodecode/templates/codeblocks/diffs.mako:674 msgid "Wide Mode Diff" msgstr "" @@ -9058,11 +9098,11 @@ msgid "Compare was calculated based on this shared commit." msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:73 +#: rhodecode/templates/compare/compare_commits.mako:78 msgid "No commits in this compare" msgstr "" @@ -9633,7 +9673,7 @@ msgid "Close File List" msgstr "" #: rhodecode/templates/files/files_browser.mako:25 -#: rhodecode/templates/summary/summary_commits.mako:103 +#: rhodecode/templates/summary/summary_commits.mako:109 msgid "Add New File" msgstr "" @@ -9909,12 +9949,12 @@ msgid "Pull request reviewers" msgstr "拉取请求检视人员" #: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 msgid "Add reviewer or reviewer group" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:504 +#: rhodecode/templates/pullrequests/pullrequest.mako:508 msgid "Please select source and target" msgstr "" @@ -9922,19 +9962,19 @@ msgstr "" msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:361 +#: rhodecode/templates/pullrequests/pullrequest.mako:364 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:368 +#: rhodecode/templates/pullrequests/pullrequest.mako:371 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:431 +#: rhodecode/templates/pullrequests/pullrequest.mako:435 msgid "Target repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:441 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Select commit reference" msgstr "" @@ -9995,8 +10035,7 @@ msgid "Merge" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:140 -#: rhodecode/templates/summary/components.mako:53 -#: rhodecode/templates/summary/components.mako:69 +#: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" @@ -10076,85 +10115,81 @@ msgid "Pull request versions not available" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:403 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:378 -msgid "Mandatory reviewer" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 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:429 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 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:431 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:419 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:442 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 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:482 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:500 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:605 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:593 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:606 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:608 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:596 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:609 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 msgid "show them" msgstr "" @@ -10265,74 +10300,59 @@ msgstr "" msgid "File" msgstr "" -#: rhodecode/templates/summary/components.mako:49 -msgid "Read-only url" -msgstr "" - -#: rhodecode/templates/summary/components.mako:56 -#: rhodecode/templates/summary/components.mako:72 +#: rhodecode/templates/summary/components.mako:71 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:76 +msgid "Copy the clone by ssh url" +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 +#: rhodecode/templates/summary/components.mako:80 msgid "SVN Protocol is disabled. To enable it, see the" msgstr "" -#: rhodecode/templates/summary/components.mako:61 +#: rhodecode/templates/summary/components.mako:80 msgid "documentation here" msgstr "" -#: rhodecode/templates/summary/components.mako:65 -msgid "Clone url" -msgstr "克隆地址" - -#: rhodecode/templates/summary/components.mako:94 +#: rhodecode/templates/summary/components.mako:100 msgid "Information" msgstr "" -#: rhodecode/templates/summary/components.mako:110 +#: rhodecode/templates/summary/components.mako:116 msgid "Number of Repository Forks" msgstr "" -#: rhodecode/templates/summary/components.mako:118 +#: rhodecode/templates/summary/components.mako:124 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:149 +#: rhodecode/templates/summary/components.mako:155 msgid "Calculating Code Statistics..." msgstr "" -#: rhodecode/templates/summary/components.mako:153 +#: rhodecode/templates/summary/components.mako:159 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" -#: rhodecode/templates/summary/components.mako:156 +#: rhodecode/templates/summary/components.mako:162 msgid "enable statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:167 +#: rhodecode/templates/summary/components.mako:173 msgid "Downloads" msgstr "" -#: rhodecode/templates/summary/components.mako:173 +#: rhodecode/templates/summary/components.mako:179 msgid "There are no downloads yet" msgstr "无下载" -#: rhodecode/templates/summary/components.mako:177 +#: rhodecode/templates/summary/components.mako:183 msgid "Downloads are disabled for this repository" msgstr "这个版本库的下载已经禁用" -#: rhodecode/templates/summary/components.mako:180 +#: rhodecode/templates/summary/components.mako:186 msgid "enable downloads" msgstr "" @@ -10365,15 +10385,15 @@ msgstr "" msgid "%s RSS feed" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:100 +#: rhodecode/templates/summary/summary_commits.mako:106 msgid "Add or upload files directly via RhodeCode:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:111 +#: rhodecode/templates/summary/summary_commits.mako:117 msgid "Push new repo:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:128 msgid "Existing repository?" msgstr "已有版本库？" @@ -10401,8 +10421,3 @@ msgstr "" #: rhodecode/tests/lib/test_ext_json.py:162 msgid "hello" msgstr "" - -#: rhodecode/tests/lib/test_ext_json.py:163 -msgid "singular" -msgid_plural "plural" -msgstr[0] "" diff --git a/rhodecode/lib/middleware/simplevcs.py b/rhodecode/lib/middleware/simplevcs.py index 88f93dc4..ef04537e 100644 --- a/rhodecode/lib/middleware/simplevcs.py +++ b/rhodecode/lib/middleware/simplevcs.py @@ -248,8 +248,11 @@ class SimpleVCS(object): repo_name, db_repo.repo_type, scm_type) return False - return is_valid_repo(repo_name, base_path, - explicit_scm=scm_type, expect_scm=scm_type) + config = db_repo._config + config.set('extensions', 'largefiles', '') + return is_valid_repo( + repo_name, base_path, + explicit_scm=scm_type, expect_scm=scm_type, config=config) def valid_and_active_user(self, user): """ diff --git a/rhodecode/lib/user_log_filter.py b/rhodecode/lib/user_log_filter.py index a87d4f90..8ac25fcf 100644 --- a/rhodecode/lib/user_log_filter.py +++ b/rhodecode/lib/user_log_filter.py @@ -106,11 +106,14 @@ def user_log_filter(user_log, search_term): elif isinstance(term, query.DateRange): field = term.fieldname val = [term.startdate, term.enddate] + elif isinstance(term, query.NullQuery.__class__): + field = '' + val = '' else: field = term.fieldname val = term.text - - user_log = user_log.filter(get_filterion(field, val, term)) + if field: + user_log = user_log.filter(get_filterion(field, val, term)) elif isinstance(qry, query.Or): filters = [] for term in qry: diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py index 4faa1231..d292524d 100644 --- a/rhodecode/lib/utils.py +++ b/rhodecode/lib/utils.py @@ -240,7 +240,7 @@ def _is_dir_writable(path): return True -def is_valid_repo(repo_name, base_path, expect_scm=None, explicit_scm=None): +def is_valid_repo(repo_name, base_path, expect_scm=None, explicit_scm=None, config=None): """ Returns True if given path is a valid repository False otherwise. If expect_scm param is given also, compare if given scm is the same @@ -251,6 +251,7 @@ def is_valid_repo(repo_name, base_path, expect_scm=None, explicit_scm=None): :param base_path: :param expect_scm: :param explicit_scm: + :param config: :return True: if given path is a valid repository """ @@ -260,7 +261,8 @@ def is_valid_repo(repo_name, base_path, expect_scm=None, explicit_scm=None): try: if explicit_scm: - detected_scms = [get_scm_backend(explicit_scm)(full_path).alias] + detected_scms = [get_scm_backend(explicit_scm)( + full_path, config=config).alias] else: detected_scms = get_scm(full_path) diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py index af1efee9..47b7a74c 100644 --- a/rhodecode/lib/vcs/backends/base.py +++ b/rhodecode/lib/vcs/backends/base.py @@ -203,6 +203,14 @@ class BaseRepository(object): def __ne__(self, other): return not self.__eq__(other) + @classmethod + def get_default_config(cls, default=None): + config = Config() + if default and isinstance(default, list): + for section, key, val in default: + config.set(section, key, val) + return config + @LazyProperty def EMPTY_COMMIT(self): return EmptyCommit(self.EMPTY_COMMIT_ID) diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py index 402fae87..e3ca9482 100644 --- a/rhodecode/lib/vcs/backends/git/repository.py +++ b/rhodecode/lib/vcs/backends/git/repository.py @@ -62,7 +62,7 @@ class GitRepository(BaseRepository): update_after_clone=False, with_wire=None, bare=False): self.path = safe_str(os.path.abspath(repo_path)) - self.config = config if config else Config() + self.config = config if config else self.get_default_config() self._remote = connection.Git( self.path, self.config, with_wire=with_wire) diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py index bdfd819d..6d856819 100644 --- a/rhodecode/lib/vcs/backends/hg/repository.py +++ b/rhodecode/lib/vcs/backends/hg/repository.py @@ -72,8 +72,14 @@ class MercurialRepository(BaseRepository): :param update_after_clone=False: sets update of working copy after making a clone """ + self.path = safe_str(os.path.abspath(repo_path)) - self.config = config if config else Config() + # mercurial since 4.4.X requires certain configuration to be present + # because sometimes we init the repos with config we need to meet + # special requirements + self.config = config if config else self.get_default_config( + default=[('extensions', 'largefiles', '1')]) + self._remote = connection.Hg( self.path, self.config, with_wire=with_wire) diff --git a/rhodecode/lib/vcs/backends/svn/repository.py b/rhodecode/lib/vcs/backends/svn/repository.py index 7eca7ce4..23acce5e 100644 --- a/rhodecode/lib/vcs/backends/svn/repository.py +++ b/rhodecode/lib/vcs/backends/svn/repository.py @@ -71,7 +71,7 @@ class SubversionRepository(base.BaseRepository): def __init__(self, repo_path, config=None, create=False, src_url=None, **kwargs): self.path = safe_str(os.path.abspath(repo_path)) - self.config = config if config else base.Config() + self.config = config if config else self.get_default_config() self._remote = connection.Svn( self.path, self.config) diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py index babe12b1..f4a8aad0 100644 --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -1760,18 +1760,6 @@ class Repository(Base, BaseModel): q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value - @classmethod - def is_valid(cls, repo_name): - """ - returns True if given repo name is a valid filesystem repository - - :param cls: - :param repo_name: - """ - from rhodecode.lib.utils import is_valid_repo - - return is_valid_repo(repo_name, cls.base_path()) - @classmethod def get_all_repos(cls, user_id=Optional(None), group_id=Optional(None), case_insensitive=True):