diff --git a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-12-01 09:53+0000\n" -"PO-Revision-Date: 2016-11-29 14:53+0000\n" +"POT-Creation-Date: 2017-02-05 17:11+0100\n" +"PO-Revision-Date: 2017-02-01 20:10+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Belarusian (http://www.transifex.com/rhodecode/RhodeCode/language/be/)\n" "MIME-Version: 1.0\n" @@ -18,89 +18,235 @@ msgstr "" "Language: be\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/admin/navigation.py:74 rhodecode/authentication/routes.py:60 -#: rhodecode/integrations/views.py:168 -#: rhodecode/templates/admin/permissions/permissions.html:36 +#: rhodecode/admin/navigation.py:83 rhodecode/authentication/routes.py:60 +#: rhodecode/integrations/views.py:167 +#: rhodecode/templates/admin/permissions/permissions.mako:36 msgid "Global" msgstr "" -#: rhodecode/admin/navigation.py:75 -#: rhodecode/templates/admin/repos/repo_edit.html:52 +#: rhodecode/admin/navigation.py:84 +#: rhodecode/templates/admin/repos/repo_edit.mako:52 msgid "VCS" msgstr "" -#: rhodecode/admin/navigation.py:76 -msgid "Visual" -msgstr "" - -#: rhodecode/admin/navigation.py:77 -msgid "Remap and Rescan" -msgstr "" - -#: rhodecode/admin/navigation.py:78 -#: rhodecode/templates/admin/repos/repo_edit.html:58 -msgid "Issue Tracker" -msgstr "" - -#: rhodecode/admin/navigation.py:80 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.html:75 -#: rhodecode/templates/admin/my_account/my_account_profile.html:48 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:94 -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit_profile.html:65 -#: rhodecode/templates/admin/users/users.html:92 -#: rhodecode/templates/email_templates/user_registration.mako:25 -#: rhodecode/templates/users/user_profile.html:51 -msgid "Email" -msgstr "" - -#: rhodecode/admin/navigation.py:81 -msgid "Hooks" -msgstr "" - -#: rhodecode/admin/navigation.py:82 -msgid "Full Text Search" -msgstr "" - -#: rhodecode/admin/navigation.py:83 -#: rhodecode/templates/admin/integrations/base.html:23 -#: rhodecode/templates/admin/integrations/form.html:8 -#: rhodecode/templates/admin/integrations/form.html:21 -#: rhodecode/templates/admin/integrations/form.html:32 -#: rhodecode/templates/admin/integrations/list.html:21 -#: rhodecode/templates/admin/integrations/list.html:25 -#: rhodecode/templates/admin/integrations/list.html:29 -#: rhodecode/templates/admin/integrations/list.html:36 -#: rhodecode/templates/admin/integrations/new.html:9 -#: rhodecode/templates/admin/integrations/new.html:17 -#: rhodecode/templates/admin/integrations/new.html:23 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:51 -#: rhodecode/templates/admin/repos/repo_edit.html:72 -#: rhodecode/templates/base/base.html:79 -msgid "Integrations" -msgstr "" - #: rhodecode/admin/navigation.py:85 -#: rhodecode/templates/admin/settings/settings_system.html:9 -msgid "System Info" +msgid "Visual" msgstr "" #: rhodecode/admin/navigation.py:86 -msgid "Open Source Licenses" +msgid "Remap and Rescan" +msgstr "" + +#: rhodecode/admin/navigation.py:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:58 +msgid "Issue Tracker" +msgstr "" + +#: rhodecode/admin/navigation.py:89 rhodecode/integrations/types/email.py:232 +#: rhodecode/templates/register.mako:75 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:48 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97 +#: rhodecode/templates/admin/users/user_add.mako:86 +#: rhodecode/templates/admin/users/user_edit_profile.mako:65 +#: rhodecode/templates/admin/users/users.mako:92 +#: rhodecode/templates/email_templates/user_registration.mako:25 +#: rhodecode/templates/users/user_profile.mako:51 +msgid "Email" +msgstr "" + +#: rhodecode/admin/navigation.py:90 +msgid "Hooks" +msgstr "" + +#: rhodecode/admin/navigation.py:91 +msgid "Full Text Search" msgstr "" #: rhodecode/admin/navigation.py:93 +#: rhodecode/templates/admin/integrations/base.mako:23 +#: rhodecode/templates/admin/integrations/form.mako:8 +#: rhodecode/templates/admin/integrations/form.mako:21 +#: rhodecode/templates/admin/integrations/form.mako:32 +#: rhodecode/templates/admin/integrations/list.mako:21 +#: rhodecode/templates/admin/integrations/list.mako:25 +#: rhodecode/templates/admin/integrations/list.mako:29 +#: rhodecode/templates/admin/integrations/list.mako:36 +#: rhodecode/templates/admin/integrations/new.mako:9 +#: rhodecode/templates/admin/integrations/new.mako:17 +#: rhodecode/templates/admin/integrations/new.mako:23 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 +#: rhodecode/templates/admin/repos/repo_edit.mako:72 +#: rhodecode/templates/base/base.mako:79 +msgid "Integrations" +msgstr "" + +#: rhodecode/admin/navigation.py:95 +#: rhodecode/templates/admin/settings/settings_system.mako:9 +msgid "System Info" +msgstr "" + +#: rhodecode/admin/navigation.py:97 +msgid "User Sessions" +msgstr "" + +#: rhodecode/admin/navigation.py:99 +msgid "Open Source Licenses" +msgstr "" + +#: rhodecode/admin/navigation.py:107 msgid "Labs" msgstr "" -#: rhodecode/admin/views.py:70 +#: rhodecode/admin/views/sessions.py:90 +msgid "Cleaned up old sessions" +msgstr "" + +#: rhodecode/admin/views/sessions.py:96 +msgid "Failed to cleanup up old sessions" +msgstr "" + +#: rhodecode/admin/views/svn_config.py:47 msgid "Apache configuration for Subversion generated." msgstr "" -#: rhodecode/admin/views.py:77 +#: rhodecode/admin/views/svn_config.py:55 msgid "Failed to generate the Apache configuration for Subversion." msgstr "" +#: rhodecode/admin/views/system_info.py:96 +msgid "" +"Note: please make sure this server can access `${url}` for the update link " +"to work" +msgstr "" + +#: rhodecode/admin/views/system_info.py:99 +msgid "Update info" +msgstr "" + +#: rhodecode/admin/views/system_info.py:101 +msgid "Check for updates" +msgstr "" + +#: rhodecode/admin/views/system_info.py:106 +msgid "RhodeCode Version" +msgstr "" + +#: rhodecode/admin/views/system_info.py:107 +msgid "RhodeCode Server IP" +msgstr "" + +#: rhodecode/admin/views/system_info.py:108 +msgid "RhodeCode Server ID" +msgstr "" + +#: rhodecode/admin/views/system_info.py:109 +msgid "RhodeCode Configuration" +msgstr "" + +#: rhodecode/admin/views/system_info.py:113 +msgid "Database" +msgstr "" + +#: rhodecode/admin/views/system_info.py:114 +msgid "Database version" +msgstr "" + +#: rhodecode/admin/views/system_info.py:118 +msgid "Platform" +msgstr "" + +#: rhodecode/admin/views/system_info.py:119 +msgid "Platform UUID" +msgstr "" + +#: rhodecode/admin/views/system_info.py:120 +msgid "Python version" +msgstr "" + +#: rhodecode/admin/views/system_info.py:121 +msgid "Python path" +msgstr "" + +#: rhodecode/admin/views/system_info.py:125 +msgid "CPU" +msgstr "" + +#: rhodecode/admin/views/system_info.py:126 +msgid "Load" +msgstr "" + +#: rhodecode/admin/views/system_info.py:127 +msgid "Memory" +msgstr "" + +#: rhodecode/admin/views/system_info.py:128 +msgid "Uptime" +msgstr "" + +#: rhodecode/admin/views/system_info.py:132 +msgid "Storage location" +msgstr "" + +#: rhodecode/admin/views/system_info.py:133 +msgid "Storage info" +msgstr "" + +#: rhodecode/admin/views/system_info.py:134 +msgid "Storage inodes" +msgstr "" + +#: rhodecode/admin/views/system_info.py:136 +msgid "Gist storage location" +msgstr "" + +#: rhodecode/admin/views/system_info.py:137 +msgid "Gist storage info" +msgstr "" + +#: rhodecode/admin/views/system_info.py:139 +msgid "Archive cache storage location" +msgstr "" + +#: rhodecode/admin/views/system_info.py:140 +msgid "Archive cache info" +msgstr "" + +#: rhodecode/admin/views/system_info.py:142 +msgid "Temp storage location" +msgstr "" + +#: rhodecode/admin/views/system_info.py:143 +msgid "Temp storage info" +msgstr "" + +#: rhodecode/admin/views/system_info.py:145 +msgid "Search info" +msgstr "" + +#: rhodecode/admin/views/system_info.py:146 +msgid "Search location" +msgstr "" + +#: rhodecode/admin/views/system_info.py:150 +msgid "VCS Backends" +msgstr "" + +#: rhodecode/admin/views/system_info.py:151 +msgid "VCS Server" +msgstr "" + +#: rhodecode/admin/views/system_info.py:152 +msgid "GIT" +msgstr "" + +#: rhodecode/admin/views/system_info.py:153 +msgid "HG" +msgstr "" + +#: rhodecode/admin/views/system_info.py:154 +msgid "SVN" +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" @@ -110,7 +256,7 @@ msgstr "" #: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 #: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 -#: rhodecode/templates/admin/integrations/list.html:101 +#: rhodecode/templates/admin/integrations/list.mako:101 msgid "Enabled" msgstr "" @@ -225,7 +371,7 @@ msgid "The url of the Jasig CAS REST ser msgstr "" #: rhodecode/authentication/plugins/auth_jasig_cas.py:65 -#: rhodecode/templates/admin/gists/show.html:21 +#: rhodecode/templates/admin/gists/show.mako:21 msgid "URL" msgstr "" @@ -258,10 +404,10 @@ msgid "Password to connect to LDAP" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.html:49 rhodecode/templates/register.html:47 -#: rhodecode/templates/admin/my_account/my_account.html:30 -#: rhodecode/templates/admin/users/user_add.html:44 -#: rhodecode/templates/base/base.html:310 +#: rhodecode/templates/login.mako:49 rhodecode/templates/register.mako:47 +#: rhodecode/templates/admin/my_account/my_account.mako:30 +#: rhodecode/templates/admin/users/user_add.mako:44 +#: rhodecode/templates/base/base.mako:310 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "" @@ -375,13 +521,12 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:64 -#: rhodecode/controllers/pullrequests.py:306 +#: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64 +#: rhodecode/controllers/pullrequests.py:202 msgid "There are no commits yet" msgstr "" #: rhodecode/controllers/changeset.py:77 -#: rhodecode/templates/files/diff_2way.html:75 msgid "Show whitespace" msgstr "" @@ -390,7 +535,6 @@ msgid "Show whitespace for all diffs" msgstr "" #: rhodecode/controllers/changeset.py:84 -#: rhodecode/templates/files/diff_2way.html:74 msgid "Ignore whitespace" msgstr "" @@ -411,42 +555,42 @@ msgstr "" msgid "No such commit exists for this repository" msgstr "" -#: rhodecode/controllers/changeset.py:334 -#: rhodecode/controllers/pullrequests.py:806 -#: rhodecode/model/pull_request.py:997 +#: rhodecode/controllers/changeset.py:344 +#: rhodecode/controllers/pullrequests.py:948 +#: rhodecode/model/pull_request.py:1009 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/controllers/changeset.py:372 +#: rhodecode/controllers/changeset.py:389 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" msgstr "" -#: rhodecode/controllers/compare.py:88 +#: rhodecode/controllers/compare.py:89 msgid "Select commit" msgstr "" -#: rhodecode/controllers/compare.py:140 +#: rhodecode/controllers/compare.py:144 #, python-format msgid "Could not find the original repo: %(repo)s" msgstr "" -#: rhodecode/controllers/compare.py:148 +#: rhodecode/controllers/compare.py:152 #, python-format msgid "Could not find the other repo: %(repo)s" msgstr "" -#: rhodecode/controllers/compare.py:157 +#: rhodecode/controllers/compare.py:164 msgid "The comparison of two different kinds of remote repos is not available" msgstr "" -#: rhodecode/controllers/compare.py:191 +#: rhodecode/controllers/compare.py:202 msgid "Could not compare repos with different large file settings" msgstr "" -#: rhodecode/controllers/compare.py:227 +#: rhodecode/controllers/compare.py:242 #, python-format msgid "" "Repositories unrelated. Cannot compare commit %(commit1)s from repository " @@ -547,28 +691,18 @@ msgstr "" msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:934 -#, python-format -msgid "Commit %(commit)s does not exist." -msgstr "" - -#: rhodecode/controllers/files.py:951 -#, python-format -msgid "%(file_path)s has not changed between %(commit_1)s and %(commit_2)s." -msgstr "" - -#: rhodecode/controllers/files.py:1018 +#: rhodecode/controllers/files.py:952 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:1039 rhodecode/controllers/summary.py:269 -#: rhodecode/model/pull_request.py:1222 rhodecode/model/scm.py:782 -#: rhodecode/templates/base/vcs_settings.html:193 +#: rhodecode/controllers/files.py:973 rhodecode/controllers/summary.py:269 +#: rhodecode/model/pull_request.py:1234 rhodecode/model/scm.py:782 +#: rhodecode/templates/base/vcs_settings.mako:193 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:1043 rhodecode/model/scm.py:797 -#: rhodecode/templates/base/vcs_settings.html:218 +#: rhodecode/controllers/files.py:977 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.mako:218 msgid "Tags" msgstr "" @@ -582,14 +716,14 @@ msgid "Groups" msgstr "" #: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:412 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:128 -#: rhodecode/templates/admin/repos/repo_add.html:15 -#: rhodecode/templates/admin/repos/repo_add.html:19 -#: rhodecode/templates/admin/users/user_edit_advanced.html:11 -#: rhodecode/templates/base/base.html:73 -#: rhodecode/templates/base/base.html:145 -#: rhodecode/templates/base/base.html:627 +#: rhodecode/controllers/pullrequests.py:308 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128 +#: 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:73 +#: rhodecode/templates/base/base.mako:145 +#: rhodecode/templates/base/base.mako:569 msgid "Repositories" msgstr "" @@ -606,70 +740,62 @@ msgstr "" msgid "journal" msgstr "" -#: rhodecode/controllers/pullrequests.py:320 +#: rhodecode/controllers/pullrequests.py:216 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:437 +#: rhodecode/controllers/pullrequests.py:333 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:439 +#: rhodecode/controllers/pullrequests.py:335 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:487 +#: rhodecode/controllers/pullrequests.py:383 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:490 +#: rhodecode/controllers/pullrequests.py:386 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:533 +#: rhodecode/controllers/pullrequests.py:429 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/controllers/pullrequests.py:539 +#: rhodecode/controllers/pullrequests.py:435 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:547 +#: rhodecode/controllers/pullrequests.py:443 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " "{count_removed} removed commits." msgstr "" -#: rhodecode/controllers/pullrequests.py:562 +#: rhodecode/controllers/pullrequests.py:458 msgid "Reload page" msgstr "" -#: rhodecode/controllers/pullrequests.py:634 -msgid "Pull request reviewer approval is pending." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:648 +#: rhodecode/controllers/pullrequests.py:532 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:685 +#: rhodecode/controllers/pullrequests.py:569 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:725 -msgid "Reviewer approval is pending." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:766 +#: rhodecode/controllers/pullrequests.py:864 msgid "Close Pull Request" msgstr "" -#: rhodecode/controllers/pullrequests.py:810 -#: rhodecode/model/pull_request.py:1001 +#: rhodecode/controllers/pullrequests.py:952 +#: rhodecode/model/pull_request.py:1013 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:860 +#: rhodecode/controllers/pullrequests.py:1002 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " @@ -701,37 +827,37 @@ msgid "Error occurred during update of d msgstr "" #: rhodecode/controllers/admin/gists.py:62 -#: rhodecode/controllers/admin/my_account.py:378 +#: rhodecode/controllers/admin/my_account.py:384 #: rhodecode/controllers/admin/users.py:465 msgid "forever" msgstr "" #: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:379 +#: rhodecode/controllers/admin/my_account.py:385 #: rhodecode/controllers/admin/users.py:466 msgid "5 minutes" msgstr "" #: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:380 +#: rhodecode/controllers/admin/my_account.py:386 #: rhodecode/controllers/admin/users.py:467 msgid "1 hour" msgstr "" #: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:381 +#: rhodecode/controllers/admin/my_account.py:387 #: rhodecode/controllers/admin/users.py:468 msgid "1 day" msgstr "" #: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:382 +#: rhodecode/controllers/admin/my_account.py:388 #: rhodecode/controllers/admin/users.py:469 msgid "1 month" msgstr "" #: rhodecode/controllers/admin/gists.py:70 -#: rhodecode/controllers/admin/my_account.py:384 +#: rhodecode/controllers/admin/my_account.py:390 #: rhodecode/controllers/admin/users.py:471 msgid "Lifetime" msgstr "" @@ -770,76 +896,76 @@ msgstr "" msgid "Error occurred during update of gist %s" msgstr "" -#: rhodecode/controllers/admin/gists.py:341 -#: rhodecode/templates/admin/gists/show.html:67 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:19 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:42 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:16 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:38 -#: rhodecode/templates/data_table/_dt_elements.html:263 +#: rhodecode/controllers/admin/gists.py:343 +#: rhodecode/templates/admin/gists/show.mako:67 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/data_table/_dt_elements.mako:263 msgid "never" msgstr "" -#: rhodecode/controllers/admin/gists.py:346 +#: rhodecode/controllers/admin/gists.py:350 #, python-format msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:75 +#: rhodecode/controllers/admin/my_account.py:80 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/my_account.py:133 +#: rhodecode/controllers/admin/my_account.py:140 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/my_account.py:148 +#: rhodecode/controllers/admin/my_account.py:155 #: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/my_account.py:214 -#: rhodecode/controllers/admin/my_account.py:220 +#: rhodecode/controllers/admin/my_account.py:221 +#: rhodecode/controllers/admin/my_account.py:227 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/controllers/admin/my_account.py:227 +#: rhodecode/controllers/admin/my_account.py:234 msgid "Successfully updated password" msgstr "" -#: rhodecode/controllers/admin/my_account.py:272 +#: rhodecode/controllers/admin/my_account.py:278 #: rhodecode/controllers/admin/users.py:645 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:279 +#: rhodecode/controllers/admin/my_account.py:285 #: rhodecode/controllers/admin/users.py:652 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/my_account.py:289 +#: rhodecode/controllers/admin/my_account.py:295 #: rhodecode/controllers/admin/users.py:667 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:387 +#: rhodecode/controllers/admin/my_account.py:393 #: rhodecode/controllers/admin/users.py:474 msgid "Role" msgstr "" -#: rhodecode/controllers/admin/my_account.py:400 +#: rhodecode/controllers/admin/my_account.py:406 #: rhodecode/controllers/admin/users.py:498 msgid "Auth token successfully created" msgstr "" -#: rhodecode/controllers/admin/my_account.py:413 +#: rhodecode/controllers/admin/my_account.py:419 #: rhodecode/controllers/admin/users.py:517 msgid "Auth token successfully reset" msgstr "" -#: rhodecode/controllers/admin/my_account.py:417 +#: rhodecode/controllers/admin/my_account.py:423 #: rhodecode/controllers/admin/users.py:521 msgid "Auth token successfully deleted" msgstr "" @@ -929,346 +1055,211 @@ msgstr "" msgid "Error creating repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:274 #, python-format msgid "Created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:273 +#: rhodecode/controllers/admin/repos.py:283 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:276 +#: rhodecode/controllers/admin/repos.py:286 #, python-format msgid "Created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:317 +#: rhodecode/controllers/admin/repos.py:327 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/admin/repos.py:336 +#: rhodecode/controllers/admin/repos.py:346 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:364 +#: rhodecode/controllers/admin/repos.py:374 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:377 #, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:372 +#: rhodecode/controllers/admin/repos.py:382 #, python-format msgid "Deleted repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos.py:385 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:380 +#: rhodecode/controllers/admin/repos.py:390 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:433 +#: rhodecode/controllers/admin/repos.py:443 msgid "Repository permissions updated" msgstr "" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:474 msgid "An error occurred during creation of field" msgstr "" -#: rhodecode/controllers/admin/repos.py:479 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during removal of field" msgstr "" -#: rhodecode/controllers/admin/repos.py:518 +#: rhodecode/controllers/admin/repos.py:528 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:522 +#: rhodecode/controllers/admin/repos.py:532 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:546 +#: rhodecode/controllers/admin/repos.py:556 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:548 +#: rhodecode/controllers/admin/repos.py:558 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:555 +#: rhodecode/controllers/admin/repos.py:565 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos.py:573 +#: rhodecode/controllers/admin/repos.py:583 msgid "Locked repository" msgstr "" -#: rhodecode/controllers/admin/repos.py:576 +#: rhodecode/controllers/admin/repos.py:586 msgid "Unlocked repository" msgstr "" -#: rhodecode/controllers/admin/repos.py:579 -#: rhodecode/controllers/admin/repos.py:608 +#: rhodecode/controllers/admin/repos.py:589 +#: rhodecode/controllers/admin/repos.py:618 msgid "An error occurred during unlocking" msgstr "" -#: rhodecode/controllers/admin/repos.py:598 +#: rhodecode/controllers/admin/repos.py:608 msgid "Unlocked" msgstr "" -#: rhodecode/controllers/admin/repos.py:602 +#: rhodecode/controllers/admin/repos.py:612 msgid "Locked" msgstr "" -#: rhodecode/controllers/admin/repos.py:604 +#: rhodecode/controllers/admin/repos.py:614 #, python-format msgid "Repository has been %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:619 +#: rhodecode/controllers/admin/repos.py:629 msgid "Cache invalidation successful" msgstr "" -#: rhodecode/controllers/admin/repos.py:623 +#: rhodecode/controllers/admin/repos.py:633 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:643 +#: rhodecode/controllers/admin/repos.py:653 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:646 +#: rhodecode/controllers/admin/repos.py:656 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:668 +#: rhodecode/controllers/admin/repos.py:678 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:715 +#: rhodecode/controllers/admin/repos.py:725 msgid "Error occurred during deleting issue tracker entry" msgstr "" -#: rhodecode/controllers/admin/repos.py:718 -#: rhodecode/controllers/admin/settings.py:383 +#: rhodecode/controllers/admin/repos.py:728 +#: rhodecode/controllers/admin/settings.py:380 msgid "Removed issue tracker entry" msgstr "" -#: rhodecode/controllers/admin/repos.py:748 -#: rhodecode/controllers/admin/settings.py:430 +#: rhodecode/controllers/admin/repos.py:758 +#: rhodecode/controllers/admin/settings.py:427 msgid "Updated issue tracker entries" msgstr "" -#: rhodecode/controllers/admin/repos.py:809 -#: rhodecode/controllers/admin/settings.py:150 -#: rhodecode/controllers/admin/settings.py:768 +#: rhodecode/controllers/admin/repos.py:819 +#: rhodecode/controllers/admin/settings.py:147 +#: rhodecode/controllers/admin/settings.py:618 msgid "Some form inputs contain invalid data." msgstr "" -#: rhodecode/controllers/admin/repos.py:827 +#: rhodecode/controllers/admin/repos.py:837 msgid "Error occurred during updating repository VCS settings" msgstr "" -#: rhodecode/controllers/admin/repos.py:831 -#: rhodecode/controllers/admin/settings.py:178 +#: rhodecode/controllers/admin/repos.py:841 +#: rhodecode/controllers/admin/settings.py:175 msgid "Updated VCS settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:174 -#: rhodecode/controllers/admin/settings.py:285 +#: rhodecode/controllers/admin/settings.py:171 +#: rhodecode/controllers/admin/settings.py:282 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:225 +#: rhodecode/controllers/admin/settings.py:222 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:281 +#: rhodecode/controllers/admin/settings.py:278 msgid "Updated application settings" msgstr "" +#: rhodecode/controllers/admin/settings.py:344 +msgid "Updated visualisation settings" +msgstr "" + #: rhodecode/controllers/admin/settings.py:347 -msgid "Updated visualisation settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:350 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:443 +#: rhodecode/controllers/admin/settings.py:440 msgid "Please enter email address" msgstr "" -#: rhodecode/controllers/admin/settings.py:461 +#: rhodecode/controllers/admin/settings.py:458 msgid "Send email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:494 +#: rhodecode/controllers/admin/settings.py:491 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:509 +#: rhodecode/controllers/admin/settings.py:506 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:513 +#: rhodecode/controllers/admin/settings.py:510 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:573 -msgid "Update info" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:575 -msgid "Check for updates" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:576 -#, python-format -msgid "" -"Note: please make sure this server can access `%s` for the update link to " -"work" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:580 -msgid "RhodeCode Version" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:581 -msgid "RhodeCode Server IP" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:582 -msgid "RhodeCode Server ID" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:583 -msgid "RhodeCode Configuration" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:587 -msgid "Database" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:588 -msgid "Database version" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:592 -msgid "Platform" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:593 -msgid "Platform UUID" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:594 -msgid "Python version" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:595 -msgid "Python path" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:599 -msgid "CPU" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:600 -msgid "Load" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:601 -msgid "Memory" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:602 -msgid "Uptime" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:606 -msgid "Storage location" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:607 -msgid "Storage info" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:608 -msgid "Storage inodes" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:610 -msgid "Gist storage location" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:611 -msgid "Gist storage info" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:613 -msgid "Archive cache storage location" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:614 -msgid "Archive cache info" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:616 -msgid "Temp storage location" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:617 -msgid "Temp storage info" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:619 -msgid "Search info" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:620 -msgid "Search location" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:624 -msgid "VCS Backends" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:625 -msgid "VCS Server" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:626 -msgid "GIT" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:627 -msgid "HG" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:628 -msgid "SVN" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:789 +#: rhodecode/controllers/admin/settings.py:639 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:794 +#: rhodecode/controllers/admin/settings.py:644 msgid "Updated Labs settings" msgstr "" @@ -1524,61 +1515,62 @@ msgstr "" msgid "user pre update" msgstr "" -#: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.html:62 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:27 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:84 -#: rhodecode/templates/admin/my_account/my_account_emails.html:65 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:104 -#: rhodecode/templates/admin/permissions/permissions_application.html:60 -#: rhodecode/templates/admin/permissions/permissions_ips.html:61 -#: rhodecode/templates/admin/permissions/permissions_objects.html:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:136 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:68 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:66 -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:80 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:111 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:161 -#: rhodecode/templates/admin/repos/repo_edit_vcs.html:46 -#: rhodecode/templates/admin/settings/settings_global.html:140 -#: rhodecode/templates/admin/settings/settings_issuetracker.html:16 -#: rhodecode/templates/admin/settings/settings_labs.html:49 -#: rhodecode/templates/admin/settings/settings_vcs.html:14 -#: rhodecode/templates/admin/settings/settings_visual.html:222 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:121 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:23 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:81 -#: rhodecode/templates/admin/users/user_edit_emails.html:63 -#: rhodecode/templates/admin/users/user_edit_ips.html:70 -#: rhodecode/templates/admin/users/user_edit_profile.html:135 -#: rhodecode/templates/base/default_perms_box.html:89 +#: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:65 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107 +#: rhodecode/templates/admin/permissions/permissions_application.mako:60 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:61 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:57 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:136 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:111 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:161 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:46 +#: rhodecode/templates/admin/settings/settings_global.mako:140 +#: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 +#: rhodecode/templates/admin/settings/settings_labs.mako:49 +#: rhodecode/templates/admin/settings/settings_vcs.mako:14 +#: rhodecode/templates/admin/settings/settings_visual.mako:222 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: rhodecode/templates/admin/users/user_edit_emails.mako:63 +#: rhodecode/templates/admin/users/user_edit_ips.mako:70 +#: rhodecode/templates/admin/users/user_edit_profile.mako:135 +#: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "" -#: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.html:49 -#: rhodecode/templates/admin/integrations/list.html:211 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:56 -#: rhodecode/templates/admin/my_account/my_account_emails.html:32 -#: rhodecode/templates/admin/permissions/permissions_ips.html:26 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:25 -#: rhodecode/templates/admin/settings/settings_hooks.html:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:52 -#: rhodecode/templates/admin/users/user_edit_emails.html:31 -#: rhodecode/templates/admin/users/user_edit_ips.html:34 -#: rhodecode/templates/base/issue_tracker_settings.html:70 -#: rhodecode/templates/base/vcs_settings.html:202 -#: rhodecode/templates/base/vcs_settings.html:227 -#: rhodecode/templates/changeset/changeset_file_comment.html:57 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 -#: rhodecode/templates/data_table/_dt_elements.html:123 -#: rhodecode/templates/data_table/_dt_elements.html:184 -#: rhodecode/templates/data_table/_dt_elements.html:198 -#: rhodecode/templates/data_table/_dt_elements.html:210 +#: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49 +#: rhodecode/templates/admin/integrations/list.mako:211 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:60 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:32 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:26 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 +#: rhodecode/templates/admin/settings/settings_hooks.mako:46 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:56 +#: rhodecode/templates/admin/users/user_edit_emails.mako:31 +#: rhodecode/templates/admin/users/user_edit_ips.mako:34 +#: rhodecode/templates/base/issue_tracker_settings.mako:70 +#: rhodecode/templates/base/vcs_settings.mako:202 +#: rhodecode/templates/base/vcs_settings.mako:227 +#: rhodecode/templates/changeset/changeset_file_comment.mako:137 +#: rhodecode/templates/changeset/changeset_file_comment.mako:139 +#: rhodecode/templates/changeset/changeset_file_comment.mako:142 +#: rhodecode/templates/data_table/_dt_elements.mako:123 +#: rhodecode/templates/data_table/_dt_elements.mako:184 +#: rhodecode/templates/data_table/_dt_elements.mako:198 +#: rhodecode/templates/data_table/_dt_elements.mako:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.html:35 -#: rhodecode/templates/files/files_source.html:39 -#: rhodecode/templates/files/files_source.html:42 -#: rhodecode/templates/pullrequests/pullrequest_show.html:53 -#: rhodecode/templates/pullrequests/pullrequest_show.html:57 +#: rhodecode/templates/files/files_source.mako:35 +#: rhodecode/templates/files/files_source.mako:39 +#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:56 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:60 msgid "Delete" msgstr "" @@ -1615,28 +1607,28 @@ msgstr "" msgid "Root repositories only" msgstr "" -#: rhodecode/integrations/views.py:162 +#: rhodecode/integrations/views.py:161 msgid "{repo_name} repository" msgstr "" -#: rhodecode/integrations/views.py:165 +#: rhodecode/integrations/views.py:164 msgid "{repo_group_name} repo group" msgstr "" -#: rhodecode/integrations/views.py:172 +#: rhodecode/integrations/views.py:171 msgid "{name} integration" msgstr "" -#: rhodecode/integrations/views.py:186 +#: rhodecode/integrations/views.py:185 msgid "Integration {integration_name} deleted successfully." msgstr "" -#: rhodecode/integrations/views.py:266 +#: rhodecode/integrations/views.py:265 msgid "" "Errors exist when saving integration settings. Please check the form inputs." msgstr "" -#: rhodecode/integrations/views.py:292 +#: rhodecode/integrations/views.py:290 msgid "Integration {integration_name} updated successfully." msgstr "" @@ -1720,20 +1712,20 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.html:42 -#: rhodecode/templates/register.html:40 -#: rhodecode/templates/admin/admin_log.html:7 -#: rhodecode/templates/admin/my_account/my_account_profile.html:24 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:21 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:66 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:70 -#: rhodecode/templates/admin/users/user_add.html:35 -#: rhodecode/templates/admin/users/user_edit_profile.html:39 -#: rhodecode/templates/admin/users/users.html:90 -#: rhodecode/templates/base/base.html:301 +#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.mako:42 +#: rhodecode/templates/register.mako:40 +#: rhodecode/templates/admin/admin_log.mako:7 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:24 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 +#: rhodecode/templates/admin/users/user_add.mako:35 +#: rhodecode/templates/admin/users/user_edit_profile.mako:39 +#: rhodecode/templates/admin/users/users.mako:90 +#: rhodecode/templates/base/base.mako:301 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 -#: rhodecode/templates/users/user_profile.html:27 +#: rhodecode/templates/users/user_profile.mako:27 msgid "Username" msgstr "" @@ -1786,11 +1778,19 @@ msgstr "" msgid "String used to validate received payloads." msgstr "" -#: rhodecode/integrations/types/webhook.py:180 +#: rhodecode/integrations/types/webhook.py:178 +msgid "Call Method" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:179 +msgid "Select if the webhook call should be made with POST or GET." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:192 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:181 +#: rhodecode/integrations/types/webhook.py:193 msgid "Post json events to a webhook endpoint" msgstr "" @@ -1884,7 +1884,7 @@ msgid "fork name %s" msgstr "" #: rhodecode/lib/action_parser.py:183 -#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:51 #, python-format msgid "Pull request #%s" msgstr "" @@ -1917,25 +1917,25 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1188 +#: rhodecode/lib/auth.py:1189 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1262 +#: rhodecode/lib/auth.py:1263 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1310 +#: rhodecode/lib/auth.py:1311 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1347 +#: rhodecode/lib/auth.py:1348 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:564 +#: rhodecode/lib/base.py:557 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1957,7 +1957,7 @@ msgstr "" msgid "No changes detected" msgstr "" -#: rhodecode/lib/diffs.py:918 +#: rhodecode/lib/diffs.py:921 msgid "Click to select line" msgstr "" @@ -2016,99 +2016,42 @@ msgid "" " filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/lib/utils2.py:463 -#, python-format -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/lib/utils2.py:464 -#, python-format -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/lib/utils2.py:465 -#, python-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/lib/utils2.py:466 -#, python-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/lib/utils2.py:467 -#, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: rhodecode/lib/utils2.py:468 -#, python-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: rhodecode/lib/utils2.py:486 -#, python-format -msgid "in %s" +msgid "in ${ago}" msgstr "" #: rhodecode/lib/utils2.py:492 -#, python-format -msgid "%s ago" -msgstr "" - -#: rhodecode/lib/utils2.py:502 -#, python-format -msgid "%s, %s ago" -msgstr "" - -#: rhodecode/lib/utils2.py:504 -#, python-format -msgid "in %s, %s" -msgstr "" - -#: rhodecode/lib/utils2.py:506 -#, python-format -msgid "%s and %s" -msgstr "" - -#: rhodecode/lib/utils2.py:508 -#, python-format -msgid "%s and %s ago" -msgstr "" - -#: rhodecode/lib/utils2.py:510 -#, python-format -msgid "in %s and %s" -msgstr "" - -#: rhodecode/lib/utils2.py:514 +msgid "${ago} ago" +msgstr "" + +#: rhodecode/lib/utils2.py:501 +msgid "${val}, ${detail}" +msgstr "" + +#: rhodecode/lib/utils2.py:503 +msgid "${val}, ${detail} ago" +msgstr "" + +#: rhodecode/lib/utils2.py:505 +msgid "in ${val}, ${detail}" +msgstr "" + +#: rhodecode/lib/utils2.py:507 +msgid "${val} and ${detail}" +msgstr "" + +#: rhodecode/lib/utils2.py:509 +msgid "${val} and ${detail} ago" +msgstr "" + +#: rhodecode/lib/utils2.py:511 +msgid "in ${val} and ${detail}" +msgstr "" + +#: rhodecode/lib/utils2.py:515 #: rhodecode/public/js/rhodecode-components.js:33194 #: rhodecode/public/js/scripts.js:25042 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" @@ -2141,7 +2084,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/model/db.py:2292 +#: rhodecode/model/db.py:2298 msgid "Repository no access" msgstr "" @@ -2173,7 +2116,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/model/db.py:2293 +#: rhodecode/model/db.py:2299 msgid "Repository read access" msgstr "" @@ -2205,7 +2148,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/model/db.py:2294 +#: rhodecode/model/db.py:2300 msgid "Repository write access" msgstr "" @@ -2237,7 +2180,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 -#: rhodecode/model/db.py:2295 +#: rhodecode/model/db.py:2301 msgid "Repository admin access" msgstr "" @@ -2309,7 +2252,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/model/db.py:2313 +#: rhodecode/model/db.py:2319 msgid "Repository creation disabled" msgstr "" @@ -2341,7 +2284,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 -#: rhodecode/model/db.py:2314 +#: rhodecode/model/db.py:2320 msgid "Repository creation enabled" msgstr "" @@ -2373,7 +2316,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 -#: rhodecode/model/db.py:2318 +#: rhodecode/model/db.py:2324 msgid "Repository forking disabled" msgstr "" @@ -2405,7 +2348,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/model/db.py:2319 +#: rhodecode/model/db.py:2325 msgid "Repository forking enabled" msgstr "" @@ -2458,7 +2401,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 -#: rhodecode/model/db.py:2962 +#: rhodecode/model/db.py:3009 msgid "Not Reviewed" msgstr "" @@ -2490,7 +2433,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 -#: rhodecode/model/db.py:2963 +#: rhodecode/model/db.py:3010 msgid "Approved" msgstr "" @@ -2522,7 +2465,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 -#: rhodecode/model/db.py:2964 +#: rhodecode/model/db.py:3011 msgid "Rejected" msgstr "" @@ -2554,7 +2497,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 -#: rhodecode/model/db.py:2965 +#: rhodecode/model/db.py:3012 msgid "Under Review" msgstr "" @@ -2583,7 +2526,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/model/db.py:2297 +#: rhodecode/model/db.py:2303 msgid "Repository group no access" msgstr "" @@ -2612,7 +2555,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/model/db.py:2298 +#: rhodecode/model/db.py:2304 msgid "Repository group read access" msgstr "" @@ -2641,7 +2584,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/model/db.py:2299 +#: rhodecode/model/db.py:2305 msgid "Repository group write access" msgstr "" @@ -2670,7 +2613,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 -#: rhodecode/model/db.py:2300 +#: rhodecode/model/db.py:2306 msgid "Repository group admin access" msgstr "" @@ -2698,7 +2641,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/model/db.py:2302 +#: rhodecode/model/db.py:2308 msgid "User group no access" msgstr "" @@ -2726,7 +2669,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 -#: rhodecode/model/db.py:2303 +#: rhodecode/model/db.py:2309 msgid "User group read access" msgstr "" @@ -2754,7 +2697,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/model/db.py:2304 +#: rhodecode/model/db.py:2310 msgid "User group write access" msgstr "" @@ -2782,7 +2725,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/model/db.py:2305 +#: rhodecode/model/db.py:2311 msgid "User group admin access" msgstr "" @@ -2810,7 +2753,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/model/db.py:2307 +#: rhodecode/model/db.py:2313 msgid "Repository Group creation disabled" msgstr "" @@ -2838,7 +2781,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/model/db.py:2308 +#: rhodecode/model/db.py:2314 msgid "Repository Group creation enabled" msgstr "" @@ -2866,7 +2809,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/model/db.py:2310 +#: rhodecode/model/db.py:2316 msgid "User Group creation disabled" msgstr "" @@ -2894,7 +2837,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 -#: rhodecode/model/db.py:2311 +#: rhodecode/model/db.py:2317 msgid "User Group creation enabled" msgstr "" @@ -2922,7 +2865,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 -#: rhodecode/model/db.py:2321 +#: rhodecode/model/db.py:2327 msgid "Registration disabled" msgstr "" @@ -2950,7 +2893,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/model/db.py:2322 +#: rhodecode/model/db.py:2328 msgid "User Registration with manual account activation" msgstr "" @@ -2978,7 +2921,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/model/db.py:2323 +#: rhodecode/model/db.py:2329 msgid "User Registration with automatic account activation" msgstr "" @@ -3006,7 +2949,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 -#: rhodecode/model/db.py:2329 rhodecode/model/permission.py:95 +#: rhodecode/model/db.py:2335 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "" @@ -3034,7 +2977,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 -#: rhodecode/model/db.py:2330 rhodecode/model/permission.py:96 +#: rhodecode/model/db.py:2336 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "" @@ -3056,7 +2999,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/model/db.py:2315 +#: rhodecode/model/db.py:2321 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3079,7 +3022,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/model/db.py:2316 +#: rhodecode/model/db.py:2322 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3099,7 +3042,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 -#: rhodecode/model/db.py:2290 +#: rhodecode/model/db.py:2296 msgid "RhodeCode Super Administrator" msgstr "" @@ -3116,7 +3059,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 -#: rhodecode/model/db.py:2332 +#: rhodecode/model/db.py:2338 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3133,7 +3076,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 -#: rhodecode/model/db.py:2333 +#: rhodecode/model/db.py:2339 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3141,7 +3084,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:907 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:913 msgid "all" msgstr "" @@ -3149,7 +3092,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:908 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:914 msgid "http/web interface" msgstr "" @@ -3157,7 +3100,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:909 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:915 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3165,7 +3108,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:910 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:916 msgid "api calls" msgstr "" @@ -3173,7 +3116,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:911 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:917 msgid "feed access" msgstr "" @@ -3182,7 +3125,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 -#: rhodecode/model/db.py:2061 +#: rhodecode/model/db.py:2067 msgid "No parent" msgstr "" @@ -3218,45 +3161,45 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:246 rhodecode/login/views.py:308 +#: rhodecode/login/views.py:249 rhodecode/login/views.py:311 msgid "Bad captcha" msgstr "" -#: rhodecode/login/views.py:255 +#: rhodecode/login/views.py:258 msgid "You have successfully registered with RhodeCode" msgstr "" -#: rhodecode/login/views.py:297 +#: rhodecode/login/views.py:300 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/login/views.py:324 +#: rhodecode/login/views.py:327 msgid "Your password reset link was sent" msgstr "" -#: rhodecode/login/views.py:348 +#: rhodecode/login/views.py:351 msgid "" "Your password reset was successful, a new password has been sent to your " "email" msgstr "" -#: rhodecode/model/comment.py:266 +#: rhodecode/model/comment.py:367 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:267 +#: rhodecode/model/comment.py:368 msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:2325 +#: rhodecode/model/db.py:2331 msgid "Password reset enabled" msgstr "" -#: rhodecode/model/db.py:2326 +#: rhodecode/model/db.py:2332 msgid "Password reset hidden" msgstr "" -#: rhodecode/model/db.py:2327 +#: rhodecode/model/db.py:2333 msgid "Password reset disabled" msgstr "" @@ -3340,61 +3283,63 @@ msgstr "" #: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 #: rhodecode/model/permission.py:79 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:126 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "" #: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 #: rhodecode/model/permission.py:80 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:12 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:13 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:12 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "" #: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 #: rhodecode/model/permission.py:81 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:13 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:14 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:13 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:14 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 +#: rhodecode/templates/changeset/changeset_file_comment.mako:266 +#: rhodecode/templates/changeset/changeset_file_comment.mako:316 msgid "Write" msgstr "" #: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 #: rhodecode/model/permission.py:82 -#: rhodecode/templates/admin/auth/auth_settings.html:12 -#: rhodecode/templates/admin/auth/plugin_settings.html:12 -#: rhodecode/templates/admin/defaults/defaults.html:12 -#: rhodecode/templates/admin/integrations/base.html:21 -#: rhodecode/templates/admin/integrations/form.html:15 -#: rhodecode/templates/admin/integrations/form.html:28 -#: rhodecode/templates/admin/integrations/list.html:8 -#: rhodecode/templates/admin/integrations/list.html:14 -#: rhodecode/templates/admin/integrations/new.html:11 -#: rhodecode/templates/admin/integrations/new.html:19 -#: rhodecode/templates/admin/permissions/permissions.html:12 -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:14 -#: rhodecode/templates/admin/repo_groups/repo_groups.html:13 -#: rhodecode/templates/admin/repos/repo_add.html:13 -#: rhodecode/templates/admin/repos/repo_add.html:17 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:15 -#: rhodecode/templates/admin/repos/repos.html:13 -#: rhodecode/templates/admin/settings/settings.html:12 -#: rhodecode/templates/admin/user_groups/user_group_add.html:11 -#: rhodecode/templates/admin/user_groups/user_group_edit.html:12 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:14 -#: rhodecode/templates/admin/user_groups/user_groups.html:13 -#: rhodecode/templates/admin/users/user_add.html:11 -#: rhodecode/templates/admin/users/user_edit.html:12 -#: rhodecode/templates/admin/users/users.html:13 -#: rhodecode/templates/admin/users/users.html:103 -#: rhodecode/templates/base/base.html:406 -#: rhodecode/templates/base/base.html:413 +#: rhodecode/templates/admin/auth/auth_settings.mako:12 +#: rhodecode/templates/admin/auth/plugin_settings.mako:12 +#: rhodecode/templates/admin/defaults/defaults.mako:12 +#: rhodecode/templates/admin/integrations/base.mako:21 +#: rhodecode/templates/admin/integrations/form.mako:15 +#: rhodecode/templates/admin/integrations/form.mako:28 +#: rhodecode/templates/admin/integrations/list.mako:8 +#: rhodecode/templates/admin/integrations/list.mako:14 +#: rhodecode/templates/admin/integrations/new.mako:11 +#: rhodecode/templates/admin/integrations/new.mako:19 +#: rhodecode/templates/admin/permissions/permissions.mako:12 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:12 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 +#: rhodecode/templates/admin/repos/repo_add.mako:13 +#: rhodecode/templates/admin/repos/repo_add.mako:17 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 +#: rhodecode/templates/admin/repos/repos.mako:13 +#: rhodecode/templates/admin/settings/settings.mako:12 +#: rhodecode/templates/admin/user_groups/user_group_add.mako:11 +#: rhodecode/templates/admin/user_groups/user_group_edit.mako:12 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:14 +#: rhodecode/templates/admin/user_groups/user_groups.mako:13 +#: rhodecode/templates/admin/users/user_add.mako:11 +#: rhodecode/templates/admin/users/user_edit.mako:12 +#: rhodecode/templates/admin/users/users.mako:13 +#: rhodecode/templates/admin/users/users.mako:103 +#: rhodecode/templates/base/base.mako:406 +#: rhodecode/templates/base/base.mako:413 msgid "Admin" msgstr "" @@ -3434,7 +3379,7 @@ msgid "This pull request cannot be merge msgstr "" #: rhodecode/model/pull_request.py:82 -msgid "This pull request cannot be merged because of conflicts." +msgid "This pull request cannot be merged because of merge conflicts." msgstr "" #: rhodecode/model/pull_request.py:84 @@ -3511,7 +3456,7 @@ msgid "" "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:523 +#: rhodecode/model/pull_request.py:524 #, python-format msgid "" "Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" @@ -3519,42 +3464,58 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:555 +#: rhodecode/model/pull_request.py:556 msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:1029 +#: rhodecode/model/pull_request.py:1041 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1031 -msgid "This pull request is closed." -msgstr "" - #: rhodecode/model/pull_request.py:1043 +msgid "This pull request is closed." +msgstr "" + +#: rhodecode/model/pull_request.py:1055 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1061 +#: rhodecode/model/pull_request.py:1073 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1064 +#: rhodecode/model/pull_request.py:1076 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1221 rhodecode/model/scm.py:790 +#: rhodecode/model/pull_request.py:1233 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1226 +#: rhodecode/model/pull_request.py:1238 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1229 +#: rhodecode/model/pull_request.py:1241 msgid "Closed Branches" msgstr "" +#: rhodecode/model/pull_request.py:1364 +msgid "User `{}` not allowed to perform merge." +msgstr "" + +#: rhodecode/model/pull_request.py:1375 +msgid "Pull request reviewer approval is pending." +msgstr "" + +#: rhodecode/model/pull_request.py:1390 +msgid "Cannot merge, {} TODO still not resolved." +msgstr "" + +#: rhodecode/model/pull_request.py:1393 +msgid "Cannot merge, {} TODOs still not resolved." +msgstr "" + #: rhodecode/model/scm.py:768 msgid "latest tip" msgstr "" @@ -3815,10 +3776,12 @@ msgstr "" msgid "Name must start with a letter or number. Got `{}`" 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" msgstr "" +#: rhodecode/model/validation_schema/schemas/comment_schema.py:48 #: rhodecode/model/validation_schema/schemas/gist_schema.py:95 msgid "Filename {} cannot be inside a directory" msgstr "" @@ -3921,319 +3884,367 @@ msgstr "" #: rhodecode/public/js/rhodecode-components.js:31198 #: rhodecode/public/js/scripts.js:23046 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33129 #: rhodecode/public/js/scripts.js:24977 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33130 #: rhodecode/public/js/scripts.js:24978 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33131 #: rhodecode/public/js/scripts.js:24979 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33132 #: rhodecode/public/js/scripts.js:24980 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33133 #: rhodecode/public/js/scripts.js:24981 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33134 #: rhodecode/public/js/scripts.js:24982 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33154 #: rhodecode/public/js/scripts.js:25002 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33162 #: rhodecode/public/js/scripts.js:25010 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33174 #: rhodecode/public/js/scripts.js:25022 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33176 #: rhodecode/public/js/scripts.js:25024 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33180 #: rhodecode/public/js/scripts.js:25028 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33182 #: rhodecode/public/js/scripts.js:25030 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" #: rhodecode/public/js/rhodecode-components.js:33184 #: rhodecode/public/js/scripts.js:25032 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47027 #: rhodecode/public/js/scripts.js:38875 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" #: rhodecode/public/js/rhodecode-components.js:47030 #: rhodecode/public/js/scripts.js:38878 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" #: rhodecode/public/js/rhodecode-components.js:47033 #: rhodecode/public/js/scripts.js:38881 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47036 #: rhodecode/public/js/scripts.js:38884 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47040 #: rhodecode/public/js/scripts.js:38888 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: 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:47042 #: rhodecode/public/js/scripts.js:38890 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: 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:47047 #: rhodecode/public/js/scripts.js:38895 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47049 #: rhodecode/public/js/scripts.js:38897 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47054 #: rhodecode/public/js/scripts.js:38902 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47056 #: rhodecode/public/js/scripts.js:38904 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47060 #: rhodecode/public/js/scripts.js:38908 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" #: rhodecode/public/js/rhodecode-components.js:47062 #: rhodecode/public/js/scripts.js:38910 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48315 -#: rhodecode/public/js/scripts.js:40163 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 -#: rhodecode/public/js/src/rhodecode/codemirror.js:369 +#: rhodecode/public/js/rhodecode-components.js:47991 +#: rhodecode/public/js/scripts.js:39839 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/src/rhodecode/changelog.js:35 +msgid "showing {0} out of {1} commit" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:47993 +#: rhodecode/public/js/scripts.js:39841 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/src/rhodecode/changelog.js:37 +msgid "showing {0} out of {1} commits" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48426 +#: rhodecode/public/js/scripts.js:40274 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/src/rhodecode/codemirror.js:296 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48333 -#: rhodecode/public/js/scripts.js:40181 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 -#: rhodecode/public/js/src/rhodecode/codemirror.js:387 +#: rhodecode/public/js/rhodecode-components.js:48445 +#: rhodecode/public/js/scripts.js:40293 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/codemirror.js:315 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48713 -#: rhodecode/public/js/scripts.js:40561 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/public/js/src/rhodecode/comments.js:236 -#: rhodecode/templates/codeblocks/diffs.html:399 -msgid "Add another comment" -msgstr "" - -#: rhodecode/public/js/rhodecode-components.js:48947 -#: rhodecode/public/js/scripts.js:40795 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 -#: rhodecode/public/js/src/rhodecode/comments.js:470 +#: rhodecode/public/js/rhodecode-components.js:48464 +#: rhodecode/public/js/scripts.js:40312 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/codemirror.js:334 +msgid "TODO comment" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48484 +#: rhodecode/public/js/scripts.js:40332 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 +#: rhodecode/public/js/src/rhodecode/codemirror.js:354 +msgid "Note Comment" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48848 +#: rhodecode/public/js/scripts.js:40696 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/src/rhodecode/comments.js:123 +msgid "resolve comment" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:48927 +#: rhodecode/public/js/scripts.js:40775 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/src/rhodecode/comments.js:202 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48961 -#: rhodecode/public/js/scripts.js:40809 +#: rhodecode/public/js/rhodecode-components.js:48941 +#: rhodecode/public/js/scripts.js:40789 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 -#: rhodecode/public/js/src/rhodecode/comments.js:484 +#: rhodecode/public/js/src/rhodecode/comments.js:216 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49074 -#: rhodecode/public/js/scripts.js:40922 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -#: rhodecode/public/js/src/rhodecode/comments.js:597 +#: rhodecode/public/js/rhodecode-components.js:49089 +#: rhodecode/public/js/scripts.js:40937 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 +#: rhodecode/public/js/src/rhodecode/comments.js:364 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49124 -#: rhodecode/public/js/scripts.js:40972 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 -#: rhodecode/public/js/src/rhodecode/comments.js:647 -#: rhodecode/templates/files/files_browser_tree.html:51 +#: rhodecode/public/js/rhodecode-components.js:49140 +#: rhodecode/public/js/scripts.js:40988 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/comments.js:415 +#: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49197 -#: rhodecode/public/js/scripts.js:41045 +#: rhodecode/public/js/rhodecode-components.js:49245 +#: rhodecode/public/js/scripts.js:41093 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 -#: rhodecode/public/js/src/rhodecode/comments.js:720 +#: rhodecode/public/js/src/rhodecode/comments.js:520 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49546 -#: rhodecode/public/js/scripts.js:41394 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +#: rhodecode/public/js/rhodecode-components.js:49316 +#: rhodecode/public/js/scripts.js:41164 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 +#: rhodecode/public/js/src/rhodecode/comments.js:591 +msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:49393 +#: rhodecode/public/js/scripts.js:41241 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 +#: rhodecode/public/js/src/rhodecode/comments.js:668 +msgid "Leave a comment on line {0}." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:49507 +#: rhodecode/public/js/scripts.js:41355 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/src/rhodecode/comments.js:782 +msgid "TODO from comment {0} was fixed." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:49713 +#: rhodecode/public/js/scripts.js:41561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49548 -#: rhodecode/public/js/scripts.js:41396 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:49715 +#: rhodecode/public/js/scripts.js:41563 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49557 -#: rhodecode/public/js/scripts.js:41405 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:49724 +#: rhodecode/public/js/scripts.js:41572 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49692 -#: rhodecode/public/js/scripts.js:41540 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 +#: rhodecode/public/js/rhodecode-components.js:49859 +#: rhodecode/public/js/scripts.js:41707 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49732 -#: rhodecode/public/js/scripts.js:41580 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:49899 +#: rhodecode/public/js/scripts.js:41747 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49733 -#: rhodecode/public/js/scripts.js:41581 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode-components.js:49900 +#: rhodecode/public/js/scripts.js:41748 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49742 -#: rhodecode/public/js/scripts.js:41590 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/rhodecode-components.js:49909 +#: rhodecode/public/js/scripts.js:41757 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49743 -#: rhodecode/public/js/scripts.js:41591 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 +#: rhodecode/public/js/rhodecode-components.js:49910 +#: rhodecode/public/js/scripts.js:41758 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50199 -#: rhodecode/public/js/scripts.js:42047 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode-components.js:50366 +#: rhodecode/public/js/scripts.js:42214 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/rhodecode/pullrequests.js:212 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50648 -#: rhodecode/public/js/scripts.js:42496 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: rhodecode/public/js/rhodecode-components.js:50937 +#: rhodecode/public/js/scripts.js:42785 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:50668 -#: rhodecode/public/js/scripts.js:42516 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode-components.js:50957 +#: rhodecode/public/js/scripts.js:42805 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "" @@ -4242,130 +4253,144 @@ msgstr "" msgid "(from usergroup {0})" msgstr "" +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 +#: rhodecode/templates/codeblocks/diffs.mako:479 +#: rhodecode/templates/codeblocks/diffs.mako:484 +msgid "Add another comment" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.html:214 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:320 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 +msgid "Diff to Commit " +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 msgid "No branches available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 -msgid "No gists available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +msgid "No gists available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 msgid "No pull requests available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 -msgid "No repository groups available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "No tags available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "No user groups available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "No users available yet." +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 -#: rhodecode/templates/changelog/changelog.html:62 -msgid "Open new pull request" +msgid "No user groups available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/templates/changelog/changelog.mako:61 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -#: rhodecode/public/js/src/i18n_messages.js:6 -#: rhodecode/templates/admin/settings/settings_email.html:48 -msgid "Send" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: 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:40 +msgid "Show at Commit " +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 msgid "Show selected commit __S" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 -msgid "Show selected commits __S ... __E" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 +msgid "Show selected commits __S ... __E" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/i18n_messages.js:7 msgid "Switch to chat" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/src/i18n_messages.js:8 msgid "Switch to comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -msgid "Updating..." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 -#: rhodecode/templates/admin/auth/auth_settings.html:71 -msgid "disabled" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 -#: rhodecode/templates/admin/auth/auth_settings.html:71 -msgid "enabled" +msgid "" +"There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 -msgid "files" +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/templates/admin/auth/auth_settings.mako:71 +msgid "disabled" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 -msgid "specify commit" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "{0} active out of {1} users" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -msgid "{0} days" +#: rhodecode/templates/admin/auth/auth_settings.mako:71 +msgid "enabled" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +msgid "files" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 -msgid "{0} hours" +msgid "specify commit" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +msgid "{0} active out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 msgid "{0} months" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 msgid "{0} years" msgstr "" @@ -4389,281 +4414,283 @@ msgstr "" msgid "Configuration for Apaache mad_dav_svn changed." msgstr "" -#: rhodecode/templates/index.html:5 +#: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "" -#: rhodecode/templates/index_base.html:8 -#: rhodecode/templates/admin/gists/index.html:18 -#: rhodecode/templates/admin/my_account/my_account_repos.html:7 -#: rhodecode/templates/admin/my_account/my_account_watched.html:7 -#: rhodecode/templates/admin/repo_groups/repo_groups.html:12 -#: rhodecode/templates/admin/repos/repos.html:12 -#: rhodecode/templates/admin/user_groups/user_groups.html:12 -#: rhodecode/templates/admin/users/users.html:12 -#: rhodecode/templates/bookmarks/bookmarks.html:12 -#: rhodecode/templates/branches/branches.html:12 -#: rhodecode/templates/journal/journal.html:12 -#: rhodecode/templates/tags/tags.html:12 +#: rhodecode/templates/index_base.mako:8 +#: rhodecode/templates/admin/gists/index.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:7 +#: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 +#: rhodecode/templates/admin/repos/repos.mako:12 +#: rhodecode/templates/admin/user_groups/user_groups.mako:12 +#: rhodecode/templates/admin/users/users.mako:12 +#: rhodecode/templates/bookmarks/bookmarks.mako:12 +#: rhodecode/templates/branches/branches.mako:12 +#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/tags/tags.mako:12 msgid "quick filter..." msgstr "" -#: rhodecode/templates/index_base.html:10 +#: rhodecode/templates/index_base.mako:10 msgid "matches" msgstr "" -#: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:39 -#: rhodecode/templates/admin/repos/repo_add.html:22 -#: rhodecode/templates/admin/repos/repos.html:27 +#: rhodecode/templates/index_base.mako:30 +#: rhodecode/templates/index_base.mako:39 +#: rhodecode/templates/admin/repos/repo_add.mako:22 +#: rhodecode/templates/admin/repos/repos.mako:27 msgid "Add Repository" msgstr "" -#: rhodecode/templates/index_base.html:34 -#: rhodecode/templates/index_base.html:42 -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16 -#: rhodecode/templates/admin/repo_groups/repo_groups.html:27 +#: rhodecode/templates/index_base.mako:34 +#: rhodecode/templates/index_base.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:27 msgid "Add Repository Group" msgstr "" -#: rhodecode/templates/index_base.html:45 +#: rhodecode/templates/index_base.mako:45 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:45 +#: rhodecode/templates/index_base.mako:45 msgid "Edit Repository Group" msgstr "" -#: rhodecode/templates/index_base.html:97 -#: rhodecode/templates/index_base.html:122 -#: rhodecode/templates/admin/gists/index.html:112 -#: rhodecode/templates/admin/integrations/list.html:102 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:39 -#: rhodecode/templates/admin/my_account/my_account_repos.html:31 -#: rhodecode/templates/admin/my_account/my_account_watched.html:31 -#: rhodecode/templates/admin/repo_groups/repo_groups.html:53 -#: rhodecode/templates/admin/repos/repo_add_base.html:9 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:15 -#: rhodecode/templates/admin/repos/repos.html:54 -#: rhodecode/templates/admin/user_groups/user_groups.html:55 -#: rhodecode/templates/base/perms_summary.html:102 -#: rhodecode/templates/bookmarks/bookmarks.html:59 -#: rhodecode/templates/branches/branches.html:58 -#: rhodecode/templates/files/files_browser_tree.html:5 -#: rhodecode/templates/pullrequests/pullrequests.html:100 -#: rhodecode/templates/tags/tags.html:59 +#: rhodecode/templates/index_base.mako:97 +#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/admin/gists/index.mako:112 +#: rhodecode/templates/admin/integrations/list.mako:102 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:39 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:31 +#: rhodecode/templates/admin/my_account/my_account_watched.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:53 +#: rhodecode/templates/admin/repos/repo_add_base.mako:9 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:15 +#: rhodecode/templates/admin/repos/repos.mako:54 +#: rhodecode/templates/admin/user_groups/user_groups.mako:55 +#: rhodecode/templates/base/perms_summary.mako:102 +#: rhodecode/templates/bookmarks/bookmarks.mako:59 +#: rhodecode/templates/branches/branches.mako:58 +#: rhodecode/templates/files/files_browser_tree.mako:5 +#: rhodecode/templates/pullrequests/pullrequests.mako:100 +#: rhodecode/templates/tags/tags.mako:59 msgid "Name" msgstr "" -#: rhodecode/templates/index_base.html:100 -#: rhodecode/templates/index_base.html:125 -#: rhodecode/templates/admin/gists/index.html:114 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:77 -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: rhodecode/templates/admin/repo_groups/repo_groups.html:56 -#: rhodecode/templates/admin/repos/repo_add_base.html:32 -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:29 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:98 -#: rhodecode/templates/admin/repos/repos.html:57 -#: rhodecode/templates/admin/user_groups/user_group_add.html:43 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:42 -#: rhodecode/templates/admin/user_groups/user_groups.html:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:74 -#: rhodecode/templates/base/issue_tracker_settings.html:10 -#: rhodecode/templates/changeset/changeset.html:53 -#: rhodecode/templates/compare/compare_commits.html:25 +#: rhodecode/templates/index_base.mako:100 +#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/admin/gists/index.mako:114 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:42 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 +#: rhodecode/templates/admin/repos/repo_add_base.mako:32 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:98 +#: rhodecode/templates/admin/repos/repos.mako:57 +#: rhodecode/templates/admin/user_groups/user_group_add.mako:43 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 +#: rhodecode/templates/admin/user_groups/user_groups.mako:57 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:78 +#: rhodecode/templates/base/issue_tracker_settings.mako:10 +#: rhodecode/templates/changeset/changeset.mako:53 +#: rhodecode/templates/compare/compare_commits.mako:20 #: rhodecode/templates/email_templates/commit_comment.mako:82 #: rhodecode/templates/email_templates/pull_request_review.mako:41 #: rhodecode/templates/email_templates/pull_request_review.mako:75 -#: rhodecode/templates/files/file_tree_detail.html:5 -#: rhodecode/templates/files/file_tree_detail.html:12 -#: rhodecode/templates/forks/fork.html:48 -#: rhodecode/templates/forks/forks_data.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:47 -#: rhodecode/templates/pullrequests/pullrequest_show.html:151 -#: rhodecode/templates/summary/components.html:73 +#: rhodecode/templates/files/file_tree_detail.mako:5 +#: rhodecode/templates/files/file_tree_detail.mako:12 +#: rhodecode/templates/forks/fork.mako:48 +#: rhodecode/templates/forks/forks_data.mako:9 +#: rhodecode/templates/pullrequests/pullrequest.mako:47 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:158 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/summary/components.mako:73 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.html:102 -#: rhodecode/templates/index_base.html:133 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:5 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:24 -#: rhodecode/templates/admin/repo_groups/repo_groups.html:60 -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:5 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:80 -#: rhodecode/templates/admin/repos/repos.html:65 -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:5 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24 -#: rhodecode/templates/admin/user_groups/user_groups.html:64 -#: rhodecode/templates/forks/forks_data.html:7 -#: rhodecode/templates/summary/components.html:195 +#: rhodecode/templates/index_base.mako:102 +#: rhodecode/templates/index_base.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:60 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:80 +#: rhodecode/templates/admin/repos/repos.mako:65 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 +#: rhodecode/templates/admin/user_groups/user_groups.mako:64 +#: rhodecode/templates/forks/forks_data.mako:7 +#: rhodecode/templates/summary/components.mako:195 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.html:128 -#: rhodecode/templates/admin/repos/repos.html:60 +#: rhodecode/templates/index_base.mako:128 +#: rhodecode/templates/admin/repos/repos.mako:60 msgid "Last Change" msgstr "" -#: rhodecode/templates/index_base.html:131 -#: rhodecode/templates/admin/my_account/my_account_repos.html:35 -#: rhodecode/templates/admin/my_account/my_account_watched.html:35 -#: rhodecode/templates/admin/repos/repos.html:63 -#: rhodecode/templates/bookmarks/bookmarks.html:66 -#: rhodecode/templates/branches/branches.html:65 -#: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changelog/changelog_summary_data.html:8 -#: rhodecode/templates/changeset/changeset.html:36 -#: rhodecode/templates/compare/compare_commits.html:23 +#: rhodecode/templates/index_base.mako:131 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:35 +#: rhodecode/templates/admin/my_account/my_account_watched.mako:35 +#: rhodecode/templates/admin/repos/repos.mako:63 +#: rhodecode/templates/bookmarks/bookmarks.mako:66 +#: rhodecode/templates/branches/branches.mako:65 +#: rhodecode/templates/changelog/changelog.mako:107 +#: rhodecode/templates/changelog/changelog_summary_data.mako:8 +#: rhodecode/templates/changeset/changeset.mako:36 +#: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/email_templates/commit_comment.mako:45 #: rhodecode/templates/email_templates/commit_comment.mako:81 -#: rhodecode/templates/search/search_commit.html:6 -#: rhodecode/templates/tags/tags.html:66 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/search/search_commit.mako:6 +#: rhodecode/templates/tags/tags.mako:66 msgid "Commit" msgstr "" -#: rhodecode/templates/index_repo_group.html:5 +#: rhodecode/templates/index_repo_group.mako:5 #, python-format msgid "%s Repository group dashboard" msgstr "" -#: rhodecode/templates/index_repo_group.html:13 +#: rhodecode/templates/index_repo_group.mako:13 msgid "Home" msgstr "" -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:34 -#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:326 +#: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:34 +#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:326 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "" -#: rhodecode/templates/login.html:36 +#: rhodecode/templates/login.mako:36 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.html:57 +#: rhodecode/templates/login.mako:57 msgid "Remember me" msgstr "" -#: rhodecode/templates/login.html:61 +#: rhodecode/templates/login.mako:61 msgid "Forgot your password?" msgstr "" -#: rhodecode/templates/login.html:65 -#: rhodecode/templates/password_reset.html:34 +#: rhodecode/templates/login.mako:65 +#: rhodecode/templates/password_reset.mako:34 msgid "Password reset is disabled. Please contact " msgstr "" -#: rhodecode/templates/login.html:67 -#: rhodecode/templates/password_reset.html:36 -#: rhodecode/templates/base/base.html:43 -#: rhodecode/templates/errors/error_document.html:62 +#: rhodecode/templates/login.mako:67 +#: rhodecode/templates/password_reset.mako:36 +#: rhodecode/templates/base/base.mako:43 +#: rhodecode/templates/errors/error_document.mako:64 msgid "Support" msgstr "" -#: rhodecode/templates/login.html:68 -#: rhodecode/templates/password_reset.html:37 -#: rhodecode/templates/files/files_add.html:54 -#: rhodecode/templates/files/files_add.html:65 +#: rhodecode/templates/login.mako:68 +#: rhodecode/templates/password_reset.mako:37 +#: rhodecode/templates/files/files_add.mako:54 +#: rhodecode/templates/files/files_add.mako:65 msgid "or" msgstr "" -#: rhodecode/templates/login.html:70 -#: rhodecode/templates/password_reset.html:39 +#: rhodecode/templates/login.mako:70 +#: rhodecode/templates/password_reset.mako:39 msgid "an administrator if you need help." msgstr "" -#: rhodecode/templates/password_reset.html:5 +#: rhodecode/templates/password_reset.mako:5 msgid "Reset Password" msgstr "" -#: rhodecode/templates/password_reset.html:46 +#: rhodecode/templates/password_reset.mako:46 msgid "Reset your Password" msgstr "" -#: rhodecode/templates/password_reset.html:47 +#: rhodecode/templates/password_reset.mako:47 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.html:51 +#: rhodecode/templates/password_reset.mako:51 msgid "Email Address" msgstr "" -#: rhodecode/templates/password_reset.html:60 -#: rhodecode/templates/register.html:84 +#: rhodecode/templates/password_reset.mako:60 +#: rhodecode/templates/register.mako:84 msgid "Captcha" msgstr "" -#: rhodecode/templates/password_reset.html:70 +#: rhodecode/templates/password_reset.mako:70 msgid "Send password reset email" msgstr "" -#: rhodecode/templates/password_reset.html:71 +#: rhodecode/templates/password_reset.mako:71 msgid "Password reset link will be sent to matching email address" msgstr "" -#: rhodecode/templates/register.html:5 +#: rhodecode/templates/register.mako:5 msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.html:34 +#: rhodecode/templates/register.mako:34 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.html:35 +#: rhodecode/templates/register.mako:35 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.html:54 +#: rhodecode/templates/register.mako:54 msgid "Re-enter password" msgstr "" -#: rhodecode/templates/register.html:61 -#: rhodecode/templates/admin/my_account/my_account_profile.html:32 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:30 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:76 -#: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit_profile.html:47 -#: rhodecode/templates/admin/users/users.html:94 +#: rhodecode/templates/register.mako:61 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:32 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:33 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:79 +#: rhodecode/templates/admin/users/user_add.mako:68 +#: rhodecode/templates/admin/users/user_edit_profile.mako:47 +#: rhodecode/templates/admin/users/users.mako:94 msgid "First Name" msgstr "" -#: rhodecode/templates/register.html:68 -#: rhodecode/templates/admin/my_account/my_account_profile.html:40 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:39 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:85 -#: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit_profile.html:56 -#: rhodecode/templates/admin/users/users.html:96 +#: rhodecode/templates/register.mako:68 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:40 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:42 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:88 +#: rhodecode/templates/admin/users/user_add.mako:77 +#: rhodecode/templates/admin/users/user_edit_profile.mako:56 +#: rhodecode/templates/admin/users/users.mako:96 msgid "Last Name" msgstr "" -#: rhodecode/templates/register.html:96 +#: rhodecode/templates/register.mako:96 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.html:103 +#: rhodecode/templates/register.mako:103 msgid "Create Account" msgstr "" -#: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:15 -#: rhodecode/templates/base/base.html:72 +#: rhodecode/templates/admin/admin.mako:5 +#: rhodecode/templates/admin/admin.mako:15 +#: rhodecode/templates/base/base.mako:72 msgid "Admin journal" msgstr "" -#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/admin/admin.mako:13 msgid "journal filter..." msgstr "" -#: rhodecode/templates/admin/admin.html:14 +#: rhodecode/templates/admin/admin.mako:14 msgid "filter" msgstr "" -#: rhodecode/templates/admin/admin.html:15 -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/admin/admin.mako:15 +#: rhodecode/templates/journal/journal.mako:14 #, python-format msgid "%s entry" msgid_plural "%s entries" @@ -4672,938 +4699,947 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/admin/admin.html:17 -#: rhodecode/templates/journal/journal.html:17 +#: rhodecode/templates/admin/admin.mako:17 +#: rhodecode/templates/journal/journal.mako:17 msgid "Example Queries" msgstr "" -#: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/admin/my_account/my_account_repos.html:37 -#: rhodecode/templates/admin/repo_groups/repo_groups.html:62 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:13 -#: rhodecode/templates/admin/repos/repos.html:69 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:71 -#: rhodecode/templates/admin/user_groups/user_groups.html:66 -#: rhodecode/templates/admin/users/users.html:107 +#: rhodecode/templates/admin/admin_log.mako:8 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:37 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:62 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 +#: rhodecode/templates/admin/repos/repos.mako:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:66 +#: rhodecode/templates/admin/users/users.mako:107 +#: rhodecode/templates/files/files_detail.mako:63 msgid "Action" msgstr "" -#: rhodecode/templates/admin/admin_log.html:9 -#: rhodecode/templates/admin/defaults/defaults.html:31 -#: rhodecode/templates/admin/permissions/permissions_objects.html:13 -#: rhodecode/templates/search/search_commit.html:5 -#: rhodecode/templates/search/search_path.html:3 +#: rhodecode/templates/admin/admin_log.mako:9 +#: rhodecode/templates/admin/defaults/defaults.mako:31 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/search/search_commit.mako:5 +#: rhodecode/templates/search/search_path.mako:3 msgid "Repository" msgstr "" -#: rhodecode/templates/admin/admin_log.html:10 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:60 -#: rhodecode/templates/tags/tags.html:61 +#: rhodecode/templates/admin/admin_log.mako:10 +#: rhodecode/templates/bookmarks/bookmarks.mako:61 +#: rhodecode/templates/branches/branches.mako:60 +#: rhodecode/templates/tags/tags.mako:61 msgid "Date" msgstr "" -#: rhodecode/templates/admin/admin_log.html:11 +#: rhodecode/templates/admin/admin_log.mako:11 msgid "From IP" msgstr "" -#: rhodecode/templates/admin/admin_log.html:46 +#: rhodecode/templates/admin/admin_log.mako:46 msgid "No actions yet" msgstr "" -#: rhodecode/templates/admin/auth/auth_settings.html:5 -#: rhodecode/templates/admin/auth/plugin_settings.html:5 +#: rhodecode/templates/admin/auth/auth_settings.mako:5 +#: rhodecode/templates/admin/auth/plugin_settings.mako:5 msgid "Authentication Settings" msgstr "" -#: rhodecode/templates/admin/auth/auth_settings.html:14 -#: rhodecode/templates/admin/auth/plugin_settings.html:14 +#: rhodecode/templates/admin/auth/auth_settings.mako:14 +#: rhodecode/templates/admin/auth/plugin_settings.mako:14 msgid "Authentication Plugins" msgstr "" -#: rhodecode/templates/admin/auth/auth_settings.html:47 +#: rhodecode/templates/admin/auth/auth_settings.mako:47 msgid "Enabled and Available Plugins" msgstr "" -#: rhodecode/templates/admin/auth/auth_settings.html:53 +#: rhodecode/templates/admin/auth/auth_settings.mako:53 msgid "Enabled Plugins" msgstr "" -#: rhodecode/templates/admin/auth/auth_settings.html:58 +#: rhodecode/templates/admin/auth/auth_settings.mako:58 msgid "" "Add a list of plugins, separated by commas. The order of the plugins is also" " the order in which RhodeCode Enterprise will try to authenticate a user." msgstr "" -#: rhodecode/templates/admin/auth/auth_settings.html:65 +#: rhodecode/templates/admin/auth/auth_settings.mako:65 msgid "Available Built-in Plugins" msgstr "" -#: rhodecode/templates/admin/auth/auth_settings.html:81 -#: rhodecode/templates/admin/auth/plugin_settings.html:87 -#: rhodecode/templates/admin/defaults/defaults_repositories.html:63 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:103 -#: rhodecode/templates/admin/permissions/permissions_application.html:59 -#: rhodecode/templates/admin/permissions/permissions_objects.html:56 -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:135 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:67 -#: rhodecode/templates/admin/repos/repo_add_base.html:90 -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:79 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:160 -#: rhodecode/templates/admin/settings/settings_hooks.html:63 -#: rhodecode/templates/admin/settings/settings_issuetracker.html:15 -#: rhodecode/templates/admin/user_groups/user_group_add.html:60 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:120 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:102 -#: rhodecode/templates/admin/users/user_add.html:128 -#: rhodecode/templates/admin/users/user_edit_profile.html:134 -#: rhodecode/templates/base/default_perms_box.html:88 +#: rhodecode/templates/admin/auth/auth_settings.mako:81 +#: rhodecode/templates/admin/auth/plugin_settings.mako:87 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:63 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:106 +#: rhodecode/templates/admin/permissions/permissions_application.mako:59 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:56 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:135 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:160 +#: rhodecode/templates/admin/settings/settings_hooks.mako:63 +#: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 +#: rhodecode/templates/admin/user_groups/user_group_add.mako:60 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 +#: rhodecode/templates/admin/users/user_add.mako:128 +#: rhodecode/templates/admin/users/user_edit_profile.mako:134 +#: rhodecode/templates/base/default_perms_box.mako:88 msgid "Save" msgstr "" -#: rhodecode/templates/admin/auth/plugin_settings.html:45 +#: rhodecode/templates/admin/auth/plugin_settings.mako:45 msgid "Plugin" msgstr "" -#: rhodecode/templates/admin/defaults/defaults.html:5 -#: rhodecode/templates/admin/defaults/defaults.html:14 +#: rhodecode/templates/admin/defaults/defaults.mako:5 +#: rhodecode/templates/admin/defaults/defaults.mako:14 msgid "Repositories defaults" msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:3 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:3 msgid "Default Settings For New Repositories" msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:14 -#: rhodecode/templates/admin/gists/index.html:110 -#: rhodecode/templates/admin/integrations/list.html:103 -#: rhodecode/templates/admin/repos/repo_add_base.html:64 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:12 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 +#: rhodecode/templates/admin/gists/index.mako:110 +#: rhodecode/templates/admin/integrations/list.mako:103 +#: rhodecode/templates/admin/repos/repo_add_base.mako:64 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:23 -#: rhodecode/templates/admin/repos/repo_add_base.html:82 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 +#: rhodecode/templates/admin/repos/repo_add_base.mako:82 msgid "Private Repository" msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:27 -#: rhodecode/templates/admin/repos/repo_add_base.html:86 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:112 -#: rhodecode/templates/forks/fork.html:87 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 +#: rhodecode/templates/admin/repos/repo_add_base.mako:86 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:112 +#: rhodecode/templates/forks/fork.mako:87 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:34 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:34 msgid "Enable Statistics" msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:38 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:38 msgid "Enable a statistics window on the repository summary page." msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:44 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:44 msgid "Enable Downloads" msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:48 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:48 msgid "Enable the download option on the repository summary page." msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:54 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:54 msgid "Enable Locking" msgstr "" -#: rhodecode/templates/admin/defaults/defaults_repositories.html:58 +#: rhodecode/templates/admin/defaults/defaults_repositories.mako:58 msgid "" "Enable automatic repository locking. Pulling from a repository will lock it," " and it is unlocked by pushing back by the same user." msgstr "" -#: rhodecode/templates/admin/gists/edit.html:5 -#: rhodecode/templates/admin/gists/edit.html:12 +#: rhodecode/templates/admin/gists/edit.mako:5 +#: rhodecode/templates/admin/gists/edit.mako:12 msgid "Edit Gist" msgstr "" -#: rhodecode/templates/admin/gists/edit.html:33 -#: rhodecode/templates/admin/gists/new.html:30 +#: rhodecode/templates/admin/gists/edit.mako:33 +#: rhodecode/templates/admin/gists/new.mako:30 msgid "Gist description ..." msgstr "" -#: rhodecode/templates/admin/gists/edit.html:38 -#: rhodecode/templates/admin/gists/new.html:38 +#: rhodecode/templates/admin/gists/edit.mako:38 +#: rhodecode/templates/admin/gists/new.mako:38 msgid "Gist lifetime" msgstr "" -#: rhodecode/templates/admin/gists/edit.html:41 -#: rhodecode/templates/admin/gists/new.html:41 +#: rhodecode/templates/admin/gists/edit.mako:41 +#: rhodecode/templates/admin/gists/new.mako:41 msgid "Gist access level" msgstr "" -#: rhodecode/templates/admin/gists/edit.html:56 -#: rhodecode/templates/admin/gists/new.html:50 -#: rhodecode/templates/files/files_add.html:74 -#: rhodecode/templates/files/files_edit.html:78 +#: rhodecode/templates/admin/gists/edit.mako:56 +#: rhodecode/templates/admin/gists/new.mako:50 +#: rhodecode/templates/files/files_add.mako:74 +#: rhodecode/templates/files/files_edit.mako:78 msgid "plain" msgstr "" -#: rhodecode/templates/admin/gists/edit.html:101 +#: rhodecode/templates/admin/gists/edit.mako:101 msgid "Update Gist" msgstr "" -#: rhodecode/templates/admin/gists/edit.html:102 -#: rhodecode/templates/base/issue_tracker_settings.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:137 -#: rhodecode/templates/codeblocks/diffs.html:84 -#: rhodecode/templates/codeblocks/diffs.html:98 -#: rhodecode/templates/files/files_add.html:102 -#: rhodecode/templates/files/files_delete.html:69 -#: rhodecode/templates/files/files_edit.html:105 +#: rhodecode/templates/admin/gists/edit.mako:102 +#: rhodecode/templates/base/issue_tracker_settings.mako:74 +#: rhodecode/templates/changeset/changeset_file_comment.mako:385 +#: rhodecode/templates/codeblocks/diffs.mako:76 +#: rhodecode/templates/files/files_add.mako:102 +#: rhodecode/templates/files/files_delete.mako:69 +#: rhodecode/templates/files/files_edit.mako:105 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:64 msgid "Cancel" msgstr "" -#: rhodecode/templates/admin/gists/edit.html:122 +#: rhodecode/templates/admin/gists/edit.mako:122 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload the new version." msgstr "" -#: rhodecode/templates/admin/gists/index.html:6 -#: rhodecode/templates/admin/gists/index.html:20 +#: rhodecode/templates/admin/gists/index.mako:6 +#: rhodecode/templates/admin/gists/index.mako:20 #, python-format msgid "Private Gists for user %s" msgstr "" -#: rhodecode/templates/admin/gists/index.html:8 -#: rhodecode/templates/admin/gists/index.html:22 +#: rhodecode/templates/admin/gists/index.mako:8 +#: rhodecode/templates/admin/gists/index.mako:22 #, python-format msgid "Public Gists for user %s" msgstr "" -#: rhodecode/templates/admin/gists/index.html:10 +#: rhodecode/templates/admin/gists/index.mako:10 msgid "Public Gists" msgstr "" -#: rhodecode/templates/admin/gists/index.html:24 +#: rhodecode/templates/admin/gists/index.mako:24 #, python-format msgid "All Gists for user %s" msgstr "" -#: rhodecode/templates/admin/gists/index.html:26 +#: rhodecode/templates/admin/gists/index.mako:26 msgid "All Public Gists" msgstr "" -#: rhodecode/templates/admin/gists/index.html:44 -#: rhodecode/templates/admin/gists/show.html:36 +#: rhodecode/templates/admin/gists/index.mako:44 +#: rhodecode/templates/admin/gists/show.mako:36 msgid "Create New Gist" msgstr "" -#: rhodecode/templates/admin/gists/index.html:56 +#: rhodecode/templates/admin/gists/index.mako:56 msgid "All gists" msgstr "" -#: rhodecode/templates/admin/gists/index.html:58 +#: rhodecode/templates/admin/gists/index.mako:58 msgid "All public" msgstr "" -#: rhodecode/templates/admin/gists/index.html:60 +#: rhodecode/templates/admin/gists/index.mako:60 msgid "My gists" msgstr "" -#: rhodecode/templates/admin/gists/index.html:61 +#: rhodecode/templates/admin/gists/index.mako:61 msgid "My private" msgstr "" -#: rhodecode/templates/admin/gists/index.html:62 +#: rhodecode/templates/admin/gists/index.mako:62 msgid "My public" msgstr "" -#: rhodecode/templates/admin/gists/index.html:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:41 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:62 -#: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changelog/changelog_summary_data.html:11 -#: rhodecode/templates/changeset/changeset.html:163 -#: rhodecode/templates/compare/compare_commits.html:22 -#: rhodecode/templates/files/files_browser_tree.html:9 -#: rhodecode/templates/pullrequests/pullrequest_show.html:198 -#: rhodecode/templates/pullrequests/pullrequests.html:102 -#: rhodecode/templates/search/search_commit.html:16 -#: rhodecode/templates/tags/tags.html:63 +#: rhodecode/templates/admin/gists/index.mako:108 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:41 +#: rhodecode/templates/bookmarks/bookmarks.mako:63 +#: rhodecode/templates/branches/branches.mako:62 +#: rhodecode/templates/changelog/changelog.mako:113 +#: rhodecode/templates/changelog/changelog_summary_data.mako:11 +#: rhodecode/templates/changeset/changeset.mako:180 +#: rhodecode/templates/compare/compare_commits.mako:17 +#: rhodecode/templates/files/files_browser_tree.mako:9 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:452 +#: rhodecode/templates/pullrequests/pullrequests.mako:102 +#: rhodecode/templates/search/search_commit.mako:16 +#: rhodecode/templates/tags/tags.mako:63 msgid "Author" msgstr "" -#: rhodecode/templates/admin/gists/index.html:116 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6 -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6 -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: rhodecode/templates/admin/users/user_edit_advanced.html:5 +#: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:5 msgid "Created on" msgstr "" -#: rhodecode/templates/admin/gists/index.html:118 -#: rhodecode/templates/admin/gists/show.html:65 +#: rhodecode/templates/admin/gists/index.mako:118 +#: rhodecode/templates/admin/gists/show.mako:65 msgid "Expires" msgstr "" -#: rhodecode/templates/admin/gists/new.html:5 -#: rhodecode/templates/admin/gists/new.html:12 +#: rhodecode/templates/admin/gists/new.mako:5 +#: rhodecode/templates/admin/gists/new.mako:12 msgid "New Gist" msgstr "" -#: rhodecode/templates/admin/gists/new.html:35 +#: rhodecode/templates/admin/gists/new.mako:35 msgid "Gist id" msgstr "" -#: rhodecode/templates/admin/gists/new.html:36 +#: rhodecode/templates/admin/gists/new.mako:36 msgid "Auto generated" msgstr "" -#: rhodecode/templates/admin/gists/new.html:49 +#: rhodecode/templates/admin/gists/new.mako:49 msgid "name this file..." msgstr "" -#: rhodecode/templates/admin/gists/new.html:60 +#: rhodecode/templates/admin/gists/new.mako:60 msgid "Create Private Gist" msgstr "" -#: rhodecode/templates/admin/gists/new.html:61 +#: rhodecode/templates/admin/gists/new.mako:61 msgid "Create Public Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.html:13 -#: rhodecode/templates/admin/gists/show.html:20 +#: rhodecode/templates/admin/gists/show.mako:13 +#: rhodecode/templates/admin/gists/show.mako:20 msgid "Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.html:49 +#: rhodecode/templates/admin/gists/show.mako:49 msgid "Confirm to delete this Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.html:56 -#: rhodecode/templates/admin/integrations/list.html:204 -#: rhodecode/templates/admin/my_account/my_account_profile.html:5 -#: rhodecode/templates/base/issue_tracker_settings.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:143 -#: rhodecode/templates/changeset/changeset_file_comment.html:267 -#: rhodecode/templates/codeblocks/diffs.html:79 -#: rhodecode/templates/data_table/_dt_elements.html:118 -#: rhodecode/templates/data_table/_dt_elements.html:180 -#: rhodecode/templates/data_table/_dt_elements.html:193 -#: rhodecode/templates/data_table/_dt_elements.html:206 +#: rhodecode/templates/admin/gists/show.mako:56 +#: rhodecode/templates/admin/integrations/list.mako:204 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:5 +#: rhodecode/templates/base/issue_tracker_settings.mako:61 +#: rhodecode/templates/data_table/_dt_elements.mako:118 +#: rhodecode/templates/data_table/_dt_elements.mako:180 +#: rhodecode/templates/data_table/_dt_elements.mako:193 +#: rhodecode/templates/data_table/_dt_elements.mako:206 #: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.html:204 -#: rhodecode/templates/files/files_edit.html:165 -#: rhodecode/templates/files/files_source.html:38 -#: rhodecode/templates/files/files_source.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:60 -#: rhodecode/templates/pullrequests/pullrequest_show.html:213 -#: rhodecode/templates/users/user_profile.html:7 +#: rhodecode/templates/files/files_add.mako:204 +#: rhodecode/templates/files/files_edit.mako:165 +#: rhodecode/templates/files/files_source.mako:38 +#: rhodecode/templates/files/files_source.mako:41 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:319 +#: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "" -#: rhodecode/templates/admin/gists/show.html:58 +#: rhodecode/templates/admin/gists/show.mako:58 msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/show.html:62 +#: rhodecode/templates/admin/gists/show.mako:62 msgid "Private Gist" msgstr "" -#: rhodecode/templates/admin/gists/show.html:77 +#: rhodecode/templates/admin/gists/show.mako:77 msgid "created" msgstr "" -#: rhodecode/templates/admin/gists/show.html:91 -#: rhodecode/templates/files/files_delete.html:50 -#: rhodecode/templates/files/files_source.html:73 +#: rhodecode/templates/admin/gists/show.mako:91 +#: rhodecode/templates/files/files_delete.mako:50 +#: rhodecode/templates/files/files_source.mako:73 msgid "Show as raw" msgstr "" -#: rhodecode/templates/admin/integrations/base.html:14 +#: rhodecode/templates/admin/integrations/base.mako:14 msgid "Integrations Settings" msgstr "" -#: rhodecode/templates/admin/integrations/form.html:17 -#: rhodecode/templates/admin/integrations/list.html:10 -#: rhodecode/templates/admin/integrations/new.html:13 -#: rhodecode/templates/admin/permissions/permissions_objects.html:28 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127 +#: rhodecode/templates/admin/integrations/form.mako:17 +#: rhodecode/templates/admin/integrations/list.mako:10 +#: rhodecode/templates/admin/integrations/new.mako:13 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:127 msgid "Repository Groups" msgstr "" -#: rhodecode/templates/admin/integrations/form.html:30 -#: rhodecode/templates/admin/integrations/list.html:16 -#: rhodecode/templates/admin/integrations/new.html:21 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:48 -#: rhodecode/templates/admin/repos/repo_edit.html:15 -#: rhodecode/templates/admin/repos/repo_edit.html:43 -#: rhodecode/templates/admin/settings/settings.html:14 -#: rhodecode/templates/admin/user_groups/user_group_edit.html:33 -#: rhodecode/templates/base/base.html:81 -#: rhodecode/templates/base/base.html:246 +#: rhodecode/templates/admin/integrations/form.mako:30 +#: rhodecode/templates/admin/integrations/list.mako:16 +#: rhodecode/templates/admin/integrations/new.mako:21 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:48 +#: rhodecode/templates/admin/repos/repo_edit.mako:15 +#: rhodecode/templates/admin/repos/repo_edit.mako:43 +#: rhodecode/templates/admin/settings/settings.mako:14 +#: rhodecode/templates/admin/user_groups/user_group_edit.mako:33 +#: rhodecode/templates/base/base.mako:81 +#: rhodecode/templates/base/base.mako:246 msgid "Settings" msgstr "" -#: rhodecode/templates/admin/integrations/form.html:60 +#: rhodecode/templates/admin/integrations/form.mako:60 #, python-format msgid "Create New %(integration_type)s Integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:44 +#: rhodecode/templates/admin/integrations/list.mako:44 msgid "Current Integrations for Repository: {repo_name}" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:46 +#: rhodecode/templates/admin/integrations/list.mako:46 msgid "Current Integrations for repository group: {repo_group_name}" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:48 +#: rhodecode/templates/admin/integrations/list.mako:48 msgid "Current Integrations" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:64 -#: rhodecode/templates/admin/notifications/notifications.html:31 +#: rhodecode/templates/admin/integrations/list.mako:64 +#: rhodecode/templates/admin/notifications/notifications.mako:31 msgid "All" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:95 -#: rhodecode/templates/admin/integrations/new.html:26 +#: rhodecode/templates/admin/integrations/list.mako:95 +#: rhodecode/templates/admin/integrations/new.mako:26 msgid "Create new integration" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:104 +#: rhodecode/templates/admin/integrations/list.mako:104 msgid "Scope" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:105 +#: rhodecode/templates/admin/integrations/list.mako:105 +#: rhodecode/templates/compare/compare_diff.mako:92 msgid "Actions" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:115 +#: rhodecode/templates/admin/integrations/list.mako:115 msgid "No {type} integrations for repo {repo} exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.html:117 +#: rhodecode/templates/admin/integrations/list.mako:117 msgid "No {type} integrations for repogroup {repogroup} exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.html:119 +#: rhodecode/templates/admin/integrations/list.mako:119 msgid "No {type} integrations exist yet." msgstr "" -#: rhodecode/templates/admin/integrations/list.html:133 +#: rhodecode/templates/admin/integrations/list.mako:133 msgid "Create one" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:164 +#: rhodecode/templates/admin/integrations/list.mako:164 msgid "repo" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:168 +#: rhodecode/templates/admin/integrations/list.mako:168 msgid "repogroup" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:170 +#: rhodecode/templates/admin/integrations/list.mako:170 msgid "child repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:172 +#: rhodecode/templates/admin/integrations/list.mako:172 msgid "cascade to all" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:177 +#: rhodecode/templates/admin/integrations/list.mako:177 msgid "top level repos only" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:179 +#: rhodecode/templates/admin/integrations/list.mako:179 msgid "global" msgstr "" -#: rhodecode/templates/admin/integrations/list.html:185 +#: rhodecode/templates/admin/integrations/list.mako:185 msgid "unknown integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.html:31 +#: rhodecode/templates/admin/integrations/new.mako:31 msgid "Create New Integration for repository: {repo_name}" msgstr "" -#: rhodecode/templates/admin/integrations/new.html:33 +#: rhodecode/templates/admin/integrations/new.mako:33 msgid "Create New Integration for repository group: {repo_group_name}" msgstr "" -#: rhodecode/templates/admin/integrations/new.html:35 +#: rhodecode/templates/admin/integrations/new.mako:35 msgid "Create New Global Integration" msgstr "" -#: rhodecode/templates/admin/integrations/new.html:61 +#: rhodecode/templates/admin/integrations/new.mako:61 msgid "No description available" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:5 -#: rhodecode/templates/base/base.html:340 +#: rhodecode/templates/admin/my_account/my_account.mako:5 +#: rhodecode/templates/base/base.mako:340 msgid "My account" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:12 +#: rhodecode/templates/admin/my_account/my_account.mako:12 msgid "My Account" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:29 -#: rhodecode/templates/admin/my_account/my_account_profile.html:4 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:4 +#: rhodecode/templates/admin/my_account/my_account.mako:29 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:4 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 msgid "My Profile" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:31 +#: rhodecode/templates/admin/my_account/my_account.mako:31 msgid "Auth Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:35 +#: rhodecode/templates/admin/my_account/my_account.mako:35 msgid "OAuth Identities" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:37 +#: rhodecode/templates/admin/my_account/my_account.mako:37 msgid "My Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:38 +#: rhodecode/templates/admin/my_account/my_account.mako:38 msgid "My Repositories" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:39 +#: rhodecode/templates/admin/my_account/my_account.mako:39 msgid "Watched" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:40 -#: rhodecode/templates/admin/notifications/notifications.html:33 -#: rhodecode/templates/base/base.html:238 +#: rhodecode/templates/admin/my_account/my_account.mako:40 +#: rhodecode/templates/admin/notifications/notifications.mako:33 +#: rhodecode/templates/base/base.mako:238 msgid "Pull Requests" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:41 +#: rhodecode/templates/admin/my_account/my_account.mako:41 msgid "My Permissions" msgstr "" -#: rhodecode/templates/admin/my_account/my_account.html:42 +#: rhodecode/templates/admin/my_account/my_account.mako:42 msgid "My Live Notifications" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:3 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:7 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:7 msgid "Built-in tokens can be used to authenticate with all possible options." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:8 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 msgid "" "Each token can have a role. VCS tokens can be used together with the " "authtoken auth plugin for git/hg/svn operations." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:14 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:11 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:11 msgid "Built-in" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:19 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:42 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:47 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:16 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:38 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:43 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:46 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:51 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:20 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:42 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:47 msgid "expires" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:25 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:22 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 #, python-format msgid "Confirm to reset this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:45 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:41 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 msgid "expired" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:55 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:51 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:63 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:67 msgid "No additional auth token specified" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:74 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:83 -#: rhodecode/templates/admin/my_account/my_account_emails.html:64 -#: rhodecode/templates/admin/permissions/permissions_ips.html:60 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.html:80 -#: rhodecode/templates/admin/users/user_edit_emails.html:62 -#: rhodecode/templates/admin/users/user_edit_ips.html:69 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:64 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:60 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:84 +#: rhodecode/templates/admin/users/user_edit_emails.mako:62 +#: rhodecode/templates/admin/users/user_edit_ips.mako:69 msgid "Add" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_emails.html:5 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:5 msgid "Account Emails" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_emails.html:17 -#: rhodecode/templates/admin/users/user_edit_emails.html:16 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:17 +#: rhodecode/templates/admin/users/user_edit_emails.mako:16 msgid "Primary" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_emails.html:31 -#: rhodecode/templates/admin/users/user_edit_emails.html:30 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:31 +#: rhodecode/templates/admin/users/user_edit_emails.mako:30 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_emails.html:42 -#: rhodecode/templates/admin/users/user_edit_emails.html:41 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:42 +#: rhodecode/templates/admin/users/user_edit_emails.mako:41 msgid "No additional emails specified" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_emails.html:57 -#: rhodecode/templates/admin/users/user_edit_emails.html:55 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:57 +#: rhodecode/templates/admin/users/user_edit_emails.mako:55 msgid "New email address" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.html:12 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:21 msgid "Your Live Notification Settings" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.html:24 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:33 msgid "Notifications Status" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_password.html:3 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:46 +msgid "Test Notifications" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_password.mako:3 msgid "Change Your Account Password" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile.html:11 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:52 -#: rhodecode/templates/admin/users/user_edit_profile.html:25 -#: rhodecode/templates/users/user_profile.html:14 +#: rhodecode/templates/admin/my_account/my_account_password.mako:6 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:18 +msgid "" +"Your user account details are managed by an external source. Details cannot " +"be managed here." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_password.mako:7 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:19 +msgid "Source type" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_profile.mako:11 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:55 +#: rhodecode/templates/admin/users/user_edit_profile.mako:25 +#: rhodecode/templates/users/user_profile.mako:14 msgid "Photo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile.html:18 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:60 -#: rhodecode/templates/admin/users/user_edit_profile.html:33 -#: rhodecode/templates/users/user_profile.html:21 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:18 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:63 +#: rhodecode/templates/admin/users/user_edit_profile.mako:33 +#: rhodecode/templates/users/user_profile.mako:21 msgid "Avatars are disabled" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile.html:51 -#: rhodecode/templates/users/user_profile.html:54 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:51 +#: rhodecode/templates/users/user_profile.mako:54 msgid "Missing email, please update your user email address." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:18 -msgid "" -"Your user account details are managed by an external source, i.e. LDAP. " -"Details cannot be managed here." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:57 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:60 msgid "Change your avatar at" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:8 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:6 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:8 msgid "Show Closed Pull Requests" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:15 msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:37 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:37 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43 -#: rhodecode/templates/admin/settings/settings_global.html:9 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:43 +#: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 -#: rhodecode/templates/pullrequests/pullrequest.html:38 -#: rhodecode/templates/pullrequests/pullrequests.html:104 +#: rhodecode/templates/pullrequests/pullrequest.mako:38 +#: rhodecode/templates/pullrequests/pullrequests.mako:104 msgid "Title" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47 -#: rhodecode/templates/pullrequests/pullrequests.html:108 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47 +#: rhodecode/templates/pullrequests/pullrequests.mako:108 msgid "Last Update" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_repos.html:3 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:3 msgid "Repositories You Own" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_watched.html:3 +#: rhodecode/templates/admin/my_account/my_account_watched.mako:3 msgid "Your Watched Repositories" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.html:5 -#: rhodecode/templates/admin/notifications/notifications.html:12 +#: rhodecode/templates/admin/notifications/notifications.mako:5 +#: rhodecode/templates/admin/notifications/notifications.mako:12 msgid "My Notifications" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.html:32 -#: rhodecode/templates/changeset/changeset.html:140 -#: rhodecode/templates/pullrequests/pullrequest_show.html:162 +#: rhodecode/templates/admin/notifications/notifications.mako:32 +#: rhodecode/templates/changeset/changeset.mako:140 msgid "Comments" msgstr "" -#: rhodecode/templates/admin/notifications/notifications.html:37 +#: rhodecode/templates/admin/notifications/notifications.mako:37 msgid "Mark all as read" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_data.html:39 +#: rhodecode/templates/admin/notifications/notifications_data.mako:39 msgid "No notifications here yet" msgstr "" -#: rhodecode/templates/admin/notifications/show_notification.html:5 -#: rhodecode/templates/admin/notifications/show_notification.html:14 +#: rhodecode/templates/admin/notifications/show_notification.mako:5 +#: rhodecode/templates/admin/notifications/show_notification.mako:14 msgid "Show notification" msgstr "" -#: rhodecode/templates/admin/notifications/show_notification.html:12 +#: rhodecode/templates/admin/notifications/show_notification.mako:12 msgid "Notifications" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:5 +#: rhodecode/templates/admin/permissions/permissions.mako:5 msgid "Permissions Administration" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:49 -#: rhodecode/templates/admin/repos/repo_edit.html:46 -#: rhodecode/templates/admin/user_groups/user_group_edit.html:34 -#: rhodecode/templates/base/base.html:77 +#: rhodecode/templates/admin/permissions/permissions.mako:14 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49 +#: rhodecode/templates/admin/repos/repo_edit.mako:46 +#: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 +#: rhodecode/templates/base/base.mako:77 msgid "Permissions" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:33 +#: rhodecode/templates/admin/permissions/permissions.mako:33 msgid "Application" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:39 +#: rhodecode/templates/admin/permissions/permissions.mako:39 msgid "Object" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:42 +#: rhodecode/templates/admin/permissions/permissions.mako:42 msgid "IP Whitelist" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:45 +#: rhodecode/templates/admin/permissions/permissions.mako:45 msgid "Overview" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:3 +#: rhodecode/templates/admin/permissions/permissions_application.mako:3 msgid "System Wide Application Permissions" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:12 +#: rhodecode/templates/admin/permissions/permissions_application.mako:12 msgid "Anonymous Access" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:18 +#: rhodecode/templates/admin/permissions/permissions_application.mako:18 #, python-format msgid "" "Allow access to RhodeCode Enterprise without requiring users to login. " "Anonymous users get the %s permission settings." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:24 +#: rhodecode/templates/admin/permissions/permissions_application.mako:24 msgid "Registration" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:33 +#: rhodecode/templates/admin/permissions/permissions_application.mako:33 msgid "Password Reset" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:42 +#: rhodecode/templates/admin/permissions/permissions_application.mako:42 msgid "Registration Page Message" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:46 +#: rhodecode/templates/admin/permissions/permissions_application.mako:46 msgid "" "Custom message to be displayed on the registration page. HTML syntax is " "supported." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:52 +#: rhodecode/templates/admin/permissions/permissions_application.mako:52 msgid "External Authentication Account Activation" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.html:5 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.html:27 -#: rhodecode/templates/admin/users/user_edit_ips.html:35 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:27 +#: rhodecode/templates/admin/users/user_edit_ips.mako:35 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.html:34 -#: rhodecode/templates/admin/users/user_edit_ips.html:43 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:34 +#: rhodecode/templates/admin/users/user_edit_ips.mako:43 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.html:49 -#: rhodecode/templates/admin/users/user_edit_ips.html:59 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:49 +#: rhodecode/templates/admin/users/user_edit_ips.mako:59 msgid "New IP Address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.html:53 -#: rhodecode/templates/admin/users/user_edit_ips.html:62 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:53 +#: rhodecode/templates/admin/users/user_edit_ips.mako:62 msgid "Description..." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ips.html:54 +#: rhodecode/templates/admin/permissions/permissions_ips.mako:54 msgid "" "Enter a comma separated list of IP Addresses like 127.0.0.1,\n" "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n" "To specify multiple addresses in a range, use the 127.0.0.1-127.0.0.10 syntax" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.html:3 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:3 msgid "" "Default Permissions for Repositories, User Groups and Repository Groups." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.html:6 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:6 msgid "" "Default system permissions. Each permissions management entity will be " "created with the following default settings. Check the overwrite checkbox to" " force any permission changes on already existing settings." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.html:20 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:20 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will be " "lost" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.html:21 -#: rhodecode/templates/admin/permissions/permissions_objects.html:35 -#: rhodecode/templates/admin/permissions/permissions_objects.html:49 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:21 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:35 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:49 msgid "Overwrite Existing Settings" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.html:34 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:34 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.html:42 -#: rhodecode/templates/admin/user_groups/user_group_edit.html:14 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:42 +#: rhodecode/templates/admin/user_groups/user_group_edit.mako:14 msgid "User Groups" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.html:48 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:48 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_perms.html:1 +#: rhodecode/templates/admin/permissions/permissions_perms.mako:1 msgid "Default User Permissions Overview" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14 -#: rhodecode/templates/admin/users/user_edit_advanced.html:12 -#: rhodecode/templates/base/base.html:74 -#: rhodecode/templates/base/base.html:148 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:12 +#: rhodecode/templates/base/base.mako:74 +#: rhodecode/templates/base/base.mako:148 msgid "Repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:15 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:36 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:15 msgid "Group Name" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:54 msgid "Group Parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63 -#: rhodecode/templates/admin/repos/repo_add_base.html:55 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:63 +#: rhodecode/templates/admin/repos/repo_add_base.mako:55 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 msgid "Copy permission settings from parent repository group." msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:5 #, python-format msgid "%s repository group settings" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:24 msgid "Add Child Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:50 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/user_groups/user_group_edit.html:35 -#: rhodecode/templates/admin/users/user_edit.html:35 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 +#: rhodecode/templates/admin/repos/repo_edit.mako:49 +#: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 +#: rhodecode/templates/admin/users/user_edit.mako:35 msgid "Advanced" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:7 msgid "Is Personal Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:9 msgid "Total repositories" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:10 msgid "Top level repositories" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:12 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:12 msgid "Children groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:18 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:18 #, python-format msgid "Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:28 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:28 msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:36 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:36 #, python-format msgid "This repository group includes %s children repository group." msgid_plural "This repository group includes %s children repository groups." @@ -5612,7 +5648,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:45 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:45 #, python-format msgid "This repository group includes %s repository." msgid_plural "This repository group includes %s repositories." @@ -5621,302 +5657,302 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:57 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:57 #, python-format msgid "Confirm to delete this group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:58 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:58 msgid "Delete this repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:5 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:5 msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:15 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:16 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:15 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:16 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:31 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:31 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:34 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 msgid "owner" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:52 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:76 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:61 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:52 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:76 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:61 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 msgid "permission for all other users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:62 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:109 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:71 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:99 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:71 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:99 msgid "Revoke" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:80 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:80 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:118 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:107 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:117 -#: rhodecode/templates/base/issue_tracker_settings.html:84 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 +#: rhodecode/templates/base/issue_tracker_settings.mako:84 msgid "Add new" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:123 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:123 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:129 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:129 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:130 msgid "" "Set or revoke permissions to selected types of children of this group, " "including non-private repositories and other groups if chosen." msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:6 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:6 #, python-format msgid "Settings for Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:36 msgid "Change owner of this repository group." msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:51 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:51 msgid "Group parent" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:59 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:59 msgid "Enable Repository Locking" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:63 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:63 msgid "" "Repository locking will be enabled on all subgroups and repositories inside " "this repository group. Pulling from a repository locks it, and it is " "unlocked by pushing back by the same user." msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.html:5 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:5 msgid "Repository groups administration" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.html:13 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:13 msgid "repository groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_groups.html:58 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:58 msgid "Number of top level repositories" msgstr "" -#: rhodecode/templates/admin/repos/repo_add.html:5 +#: rhodecode/templates/admin/repos/repo_add.mako:5 msgid "Add repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:14 +#: rhodecode/templates/admin/repos/repo_add_base.mako:14 msgid "Import Existing Repository ?" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:23 -#: rhodecode/templates/base/base.html:193 +#: rhodecode/templates/admin/repos/repo_add_base.mako:23 +#: rhodecode/templates/base/base.mako:193 msgid "Clone from" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:27 +#: rhodecode/templates/admin/repos/repo_add_base.mako:27 msgid "Optional http[s] URL from which to clone a repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:36 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:102 -#: rhodecode/templates/forks/fork.html:52 +#: rhodecode/templates/admin/repos/repo_add_base.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 +#: rhodecode/templates/forks/fork.mako:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:41 +#: rhodecode/templates/admin/repos/repo_add_base.mako:41 msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:62 -#: rhodecode/templates/forks/fork.html:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:62 +#: rhodecode/templates/forks/fork.mako:64 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:50 -#: rhodecode/templates/forks/fork.html:67 +#: rhodecode/templates/admin/repos/repo_add_base.mako:50 +#: rhodecode/templates/forks/fork.mako:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:59 +#: rhodecode/templates/admin/repos/repo_add_base.mako:59 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:68 +#: rhodecode/templates/admin/repos/repo_add_base.mako:68 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:70 -#: rhodecode/templates/forks/fork.html:73 +#: rhodecode/templates/admin/repos/repo_add_base.mako:73 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:70 +#: rhodecode/templates/forks/fork.mako:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:77 +#: rhodecode/templates/admin/repos/repo_add_base.mako:77 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" -#: rhodecode/templates/admin/repos/repo_creating.html:5 +#: rhodecode/templates/admin/repos/repo_creating.mako:5 #, python-format msgid "%s Creating repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_creating.html:12 +#: rhodecode/templates/admin/repos/repo_creating.mako:12 msgid "Creating repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_creating.html:26 +#: rhodecode/templates/admin/repos/repo_creating.mako:26 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected when " "this process is finished.repo_name" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:8 +#: rhodecode/templates/admin/repos/repo_edit.mako:8 #, python-format msgid "%s repository settings" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:55 +#: rhodecode/templates/admin/repos/repo_edit.mako:55 msgid "Extra Fields" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:61 +#: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Caches" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:65 +#: rhodecode/templates/admin/repos/repo_edit.mako:65 msgid "Remote" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:69 -#: rhodecode/templates/summary/components.html:135 +#: rhodecode/templates/admin/repos/repo_edit.mako:69 +#: rhodecode/templates/summary/components.mako:135 msgid "Statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:87 +#: rhodecode/templates/admin/repos/repo_edit.mako:87 msgid "Reviewers" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:7 msgid "Updated on" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:8 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:8 msgid "Cached Commit id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:14 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14 #, python-format msgid "Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:24 msgid "Fork Reference" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:30 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30 #, python-format msgid "This repository is a fork of %(repo_link)s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:36 -#: rhodecode/templates/admin/repos/repo_edit_fork.html:5 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_fork.mako:5 msgid "Set" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:39 -#: rhodecode/templates/admin/repos/repo_edit_fork.html:9 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:39 +#: rhodecode/templates/admin/repos/repo_edit_fork.mako:9 msgid "Manually set this repository as a fork of another from the list" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:48 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:48 msgid "Public Journal Visibility" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56 msgid "Remove from Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:60 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60 msgid "Add to Public Journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:65 +#: 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.html:74 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:74 msgid "Locking state" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83 msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90 msgid "Confirm to unlock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:92 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:97 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97 msgid "Confirm to lock repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:99 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:105 +#: 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.html:114 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:114 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:121 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:121 #, python-format msgid "This repository has %s fork." msgid_plural "This repository has %s forks." @@ -5925,25 +5961,25 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:125 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:130 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:139 -#: rhodecode/templates/data_table/_dt_elements.html:124 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139 +#: rhodecode/templates/data_table/_dt_elements.mako:124 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:141 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 msgid "Delete This Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:146 +#: 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 " @@ -5951,33 +5987,33 @@ msgid "" "rhodecode-cleanup-repos command." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:180 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.html:180 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180 msgid "Pick repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.html:3 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.html:10 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 msgid "Invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.html:10 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10 msgid "Confirm to invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.html:14 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14 msgid "" "Manually invalidate the repository cache. On the next access a repository " "cache will be recreated." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.html:28 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:28 #, python-format msgid "List of repository caches (%(count)s entry)" msgid_plural "List of repository caches (%(count)s entries)" @@ -5986,420 +6022,420 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/admin/repos/repo_edit_caches.html:35 -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:32 -#: rhodecode/templates/base/issue_tracker_settings.html:13 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:35 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32 +#: rhodecode/templates/base/issue_tracker_settings.mako:13 msgid "Prefix" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.html:36 -#: rhodecode/templates/admin/repos/repo_edit_fields.html:11 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:36 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:11 msgid "Key" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.html:37 -#: rhodecode/templates/admin/user_groups/user_group_add.html:52 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:51 -#: rhodecode/templates/admin/user_groups/user_groups.html:62 -#: rhodecode/templates/admin/users/user_add.html:97 -#: rhodecode/templates/admin/users/user_edit_profile.html:90 -#: rhodecode/templates/admin/users/users.html:101 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:37 +#: 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:62 +#: rhodecode/templates/admin/users/user_add.mako:97 +#: rhodecode/templates/admin/users/user_edit_profile.mako:90 +#: rhodecode/templates/admin/users/users.mako:101 msgid "Active" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_fields.html:3 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:3 msgid "Custom extra fields for this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_fields.html:10 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:10 msgid "Label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_fields.html:24 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:24 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_fields.html:40 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:40 msgid "New Field Key" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_fields.html:48 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:48 msgid "New Field Label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_fields.html:51 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:51 msgid "Enter short label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_fields.html:57 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:57 msgid "New Field Description" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_fields.html:60 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:60 msgid "Enter a full description for the field" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_fields.html:73 +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:73 msgid "" "Extra fields are disabled. You can enable them from the " "Admin/Settings/Visual page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:9 -#: rhodecode/templates/admin/repos/repo_edit_vcs.html:9 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:9 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:9 msgid "Inherit from global settings" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:14 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:14 msgid "Select to inherit global patterns for issue tracker." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:24 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:24 msgid "Inherited Issue Tracker Patterns" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:30 -#: rhodecode/templates/base/issue_tracker_settings.html:11 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30 +#: rhodecode/templates/base/issue_tracker_settings.mako:11 msgid "Pattern" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:31 -#: rhodecode/templates/base/issue_tracker_settings.html:12 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31 +#: rhodecode/templates/base/issue_tracker_settings.mako:12 msgid "Url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:70 -#: rhodecode/templates/admin/settings/settings_issuetracker.html:5 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:70 +#: rhodecode/templates/admin/settings/settings_issuetracker.mako:5 msgid "Issue Tracker / Wiki Patterns" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:91 -#: rhodecode/templates/admin/settings/settings_issuetracker.html:24 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:91 +#: rhodecode/templates/admin/settings/settings_issuetracker.mako:24 msgid "Test Patterns" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:5 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5 msgid "Repository Permissions" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:43 msgid "private repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:48 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:48 msgid "only users/user groups explicitly added here will have access" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.html:3 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:3 msgid "Remote url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.html:9 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:9 msgid "Remote mirror url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.html:14 -#: rhodecode/templates/admin/repos/repo_edit_remote.html:22 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.html:14 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:14 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.html:19 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:19 msgid "This repository does not have any remote mirror url set." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:6 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:6 #, python-format msgid "Settings for Repository: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:19 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19 msgid "Non-changeable id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:19 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19 msgid "what is that ?" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:21 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:21 msgid "URL by id" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:22 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22 msgid "" "In case this repository is renamed or moved into another group the repository url changes.\n" " Using above url guarantees that this repository will always be accessible under such url.\n" " Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:30 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:30 msgid "Remote uri" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:36 -#: rhodecode/templates/base/perms_summary.html:79 -#: rhodecode/templates/base/perms_summary.html:149 -#: rhodecode/templates/base/perms_summary.html:151 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:36 +#: rhodecode/templates/base/perms_summary.mako:79 +#: rhodecode/templates/base/perms_summary.mako:149 +#: rhodecode/templates/base/perms_summary.mako:151 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:39 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:39 msgid "new value, leave empty to remove" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:41 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:41 msgid "cancel" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:48 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:48 msgid "" "http[s] url where from repository was imported, also used for doing remote " "pulls." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:56 -#: rhodecode/templates/data_table/_dt_elements.html:164 -#: rhodecode/templates/forks/fork.html:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:56 +#: rhodecode/templates/data_table/_dt_elements.mako:164 +#: rhodecode/templates/forks/fork.mako:58 msgid "Repository group" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:65 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:65 msgid "Optional select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:74 -#: rhodecode/templates/forks/fork.html:77 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:74 +#: rhodecode/templates/forks/fork.mako:77 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:92 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:92 msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:108 -#: rhodecode/templates/data_table/_dt_elements.html:58 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:108 +#: rhodecode/templates/data_table/_dt_elements.mako:58 msgid "Private repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:117 msgid "Enable statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:121 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121 msgid "Enable statistics window on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:126 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:126 msgid "Enable downloads" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:130 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:130 msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:135 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:135 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:139 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:139 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_statistics.html:3 +#: rhodecode/templates/admin/repos/repo_edit_statistics.mako:3 msgid "Repository statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_statistics.html:11 +#: rhodecode/templates/admin/repos/repo_edit_statistics.mako:11 msgid "Processed commits" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_statistics.html:12 +#: rhodecode/templates/admin/repos/repo_edit_statistics.mako:12 msgid "Processed progress" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_statistics.html:15 +#: rhodecode/templates/admin/repos/repo_edit_statistics.mako:15 msgid "Reset statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_statistics.html:15 +#: rhodecode/templates/admin/repos/repo_edit_statistics.mako:15 msgid "Confirm to remove current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.html:14 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:14 msgid "Select to inherit global vcs settings." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_vcs.html:45 -#: rhodecode/templates/admin/settings/settings_global.html:139 -#: rhodecode/templates/admin/settings/settings_labs.html:48 -#: rhodecode/templates/admin/settings/settings_vcs.html:13 -#: rhodecode/templates/admin/settings/settings_visual.html:221 +#: rhodecode/templates/admin/repos/repo_edit_vcs.mako:45 +#: rhodecode/templates/admin/settings/settings_global.mako:139 +#: rhodecode/templates/admin/settings/settings_labs.mako:48 +#: rhodecode/templates/admin/settings/settings_vcs.mako:13 +#: rhodecode/templates/admin/settings/settings_visual.mako:221 msgid "Save settings" msgstr "" -#: rhodecode/templates/admin/repos/repos.html:5 +#: rhodecode/templates/admin/repos/repos.mako:5 msgid "Repositories administration" msgstr "" -#: rhodecode/templates/admin/repos/repos.html:13 +#: rhodecode/templates/admin/repos/repos.mako:13 msgid "repositories" msgstr "" -#: rhodecode/templates/admin/repos/repos.html:67 +#: rhodecode/templates/admin/repos/repos.mako:67 msgid "State" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:5 +#: rhodecode/templates/admin/settings/settings.mako:5 msgid "Settings administration" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:3 +#: rhodecode/templates/admin/settings/settings_email.mako:3 msgid "Email Configuration" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:8 +#: rhodecode/templates/admin/settings/settings_email.mako:8 msgid "Email prefix" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:9 +#: rhodecode/templates/admin/settings/settings_email.mako:9 msgid "RhodeCode email from" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:10 +#: rhodecode/templates/admin/settings/settings_email.mako:10 msgid "Error email from" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:11 +#: rhodecode/templates/admin/settings/settings_email.mako:11 msgid "Error email recipients" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:13 +#: rhodecode/templates/admin/settings/settings_email.mako:13 msgid "SMTP server" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:14 +#: rhodecode/templates/admin/settings/settings_email.mako:14 msgid "SMTP username" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:15 +#: rhodecode/templates/admin/settings/settings_email.mako:15 msgid "SMTP password" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:16 +#: rhodecode/templates/admin/settings/settings_email.mako:16 msgid "SMTP port" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:18 +#: rhodecode/templates/admin/settings/settings_email.mako:18 msgid "SMTP use TLS" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:19 +#: rhodecode/templates/admin/settings/settings_email.mako:19 msgid "SMTP use SSL" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:20 +#: rhodecode/templates/admin/settings/settings_email.mako:20 msgid "SMTP auth" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:34 +#: rhodecode/templates/admin/settings/settings_email.mako:34 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:40 +#: rhodecode/templates/admin/settings/settings_email.mako:40 msgid "enter valid email" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:44 +#: rhodecode/templates/admin/settings/settings_email.mako:44 msgid "Send an auto-generated email from this server to above email..." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:5 +#: rhodecode/templates/admin/settings/settings_global.mako:5 msgid "Branding" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:16 +#: rhodecode/templates/admin/settings/settings_global.mako:16 msgid "" "Set a custom title for your RhodeCode instance (limited to 40 characters)." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:20 +#: rhodecode/templates/admin/settings/settings_global.mako:20 msgid "HTTP[S] authentication realm" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:27 +#: rhodecode/templates/admin/settings/settings_global.mako:27 msgid "" "Set a custom text that is shown as authentication message to clients trying " "to connect." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:36 -#: rhodecode/templates/admin/users/user_edit_advanced.html:56 +#: rhodecode/templates/admin/settings/settings_global.mako:36 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:56 msgid "Personal Repository Group" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:41 +#: rhodecode/templates/admin/settings/settings_global.mako:41 msgid "Create Personal Repository Group" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:44 +#: rhodecode/templates/admin/settings/settings_global.mako:44 msgid "Always create Personal Repository Groups for new users." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:45 +#: rhodecode/templates/admin/settings/settings_global.mako:45 msgid "" "When creating new users from add user form or API you can still turn this " "off via a checkbox or flag" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:49 +#: rhodecode/templates/admin/settings/settings_global.mako:49 msgid "Personal Repo Group Pattern" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:55 +#: rhodecode/templates/admin/settings/settings_global.mako:55 msgid "" "Pattern used to create Personal Repository Groups. Prefix can be other " "existing repository group path[s], eg. /u/${username}" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:56 +#: rhodecode/templates/admin/settings/settings_global.mako:56 msgid "Available variables are currently ${username} and ${user_id}" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:64 +#: rhodecode/templates/admin/settings/settings_global.mako:64 msgid "Registration Captcha" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:68 +#: rhodecode/templates/admin/settings/settings_global.mako:68 msgid "Google ReCaptcha public key" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:75 +#: rhodecode/templates/admin/settings/settings_global.mako:75 msgid "Public key for reCaptcha system." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:80 +#: rhodecode/templates/admin/settings/settings_global.mako:80 msgid "Google ReCaptcha private key" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:87 +#: rhodecode/templates/admin/settings/settings_global.mako:87 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha on " "registration" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:95 +#: rhodecode/templates/admin/settings/settings_global.mako:95 msgid "Custom Header Code" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:100 -#: rhodecode/templates/admin/settings/settings_global.html:123 +#: rhodecode/templates/admin/settings/settings_global.mako:100 +#: rhodecode/templates/admin/settings/settings_global.mako:123 #: rhodecode/templates/debug_style/form-elements-small.html:59 #: rhodecode/templates/debug_style/form-elements.html:57 #: rhodecode/templates/debug_style/form-elements.html:82 @@ -6422,8 +6458,8 @@ msgstr "" msgid "Templates..." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:103 -#: rhodecode/templates/admin/settings/settings_global.html:126 +#: rhodecode/templates/admin/settings/settings_global.mako:103 +#: rhodecode/templates/admin/settings/settings_global.mako:126 #: rhodecode/templates/debug_style/form-elements-small.html:62 #: rhodecode/templates/debug_style/form-elements.html:60 #: rhodecode/templates/debug_style/form-elements.html:85 @@ -6446,148 +6482,194 @@ msgstr "" msgid "Server Announcement" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:104 +#: rhodecode/templates/admin/settings/settings_global.mako:104 msgid "Flash message filtering" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:110 +#: rhodecode/templates/admin/settings/settings_global.mako:110 msgid "Custom js/css code added at the end of the
tag." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:111 +#: rhodecode/templates/admin/settings/settings_global.mako:111 msgid "Use