diff --git a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-11-27 20:56+0100\n" +"POT-Creation-Date: 2012-12-03 03:21+0100\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -48,6 +48,7 @@ msgstr "" #: rhodecode/controllers/compare.py:75 #: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "" @@ -179,7 +180,7 @@ msgstr "" msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -265,19 +266,19 @@ msgid "An error occurred during this sea msgstr "" #: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:267 +#: rhodecode/controllers/admin/repos.py:268 #, python-format msgid "Repository %s updated successfully" msgstr "" #: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:285 +#: rhodecode/controllers/admin/repos.py:286 #, python-format msgid "error occurred during update of repository %s" msgstr "" #: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/admin/repos.py:304 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -286,14 +287,14 @@ msgid "" msgstr "" #: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:315 +#: rhodecode/controllers/admin/repos.py:316 #, python-format msgid "deleted repository %s" msgstr "" #: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:325 -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:326 +#: rhodecode/controllers/admin/repos.py:332 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -312,7 +313,7 @@ msgid "Repository has been %s" msgstr "" #: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:423 +#: rhodecode/controllers/admin/repos.py:424 msgid "An error occurred during unlocking" msgstr "" @@ -325,6 +326,14 @@ msgstr "" msgid "Statistics are disabled for this repository" msgstr "" +#: rhodecode/controllers/admin/defaults.py:96 +msgid "Default settings updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/defaults.py:110 +msgid "error occurred during update of defaults" +msgstr "" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" @@ -382,18 +391,23 @@ msgid "error occurred during update of l msgstr "" #: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 msgid "None" msgstr "" #: rhodecode/controllers/admin/permissions.py:60 +#: rhodecode/controllers/admin/permissions.py:64 msgid "Read" msgstr "" #: rhodecode/controllers/admin/permissions.py:61 +#: rhodecode/controllers/admin/permissions.py:65 msgid "Write" msgstr "" #: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:66 +#: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 #: rhodecode/templates/admin/repos/repo_add.html:9 @@ -412,112 +426,112 @@ msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:349 -#: rhodecode/templates/base/base.html:351 -#: rhodecode/templates/base/base.html:353 +#: rhodecode/templates/base/base.html:350 +#: rhodecode/templates/base/base.html:352 +#: rhodecode/templates/base/base.html:354 msgid "Admin" msgstr "" -#: rhodecode/controllers/admin/permissions.py:65 -msgid "disabled" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:67 -msgid "allowed with manual account activation" -msgstr "" - #: rhodecode/controllers/admin/permissions.py:69 -msgid "allowed with automatic account activation" +msgid "disabled" msgstr "" #: rhodecode/controllers/admin/permissions.py:71 -#: rhodecode/controllers/admin/permissions.py:74 +msgid "allowed with manual account activation" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:73 +msgid "allowed with automatic account activation" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:75 +#: rhodecode/controllers/admin/permissions.py:78 msgid "Disabled" msgstr "" -#: rhodecode/controllers/admin/permissions.py:72 -#: rhodecode/controllers/admin/permissions.py:75 +#: rhodecode/controllers/admin/permissions.py:76 +#: rhodecode/controllers/admin/permissions.py:79 msgid "Enabled" msgstr "" -#: rhodecode/controllers/admin/permissions.py:116 +#: rhodecode/controllers/admin/permissions.py:122 msgid "Default permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:130 +#: rhodecode/controllers/admin/permissions.py:136 msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:124 +#: rhodecode/controllers/admin/repos.py:125 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:193 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:197 +#: rhodecode/controllers/admin/repos.py:198 #, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:228 +#: rhodecode/controllers/admin/repos.py:229 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:320 +#: rhodecode/controllers/admin/repos.py:321 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:349 +#: rhodecode/controllers/admin/repos.py:350 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:369 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:386 +#: rhodecode/controllers/admin/repos.py:387 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:403 +#: rhodecode/controllers/admin/repos.py:404 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:443 +#: rhodecode/controllers/admin/repos.py:444 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:448 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:466 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:468 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:483 +#: rhodecode/controllers/admin/repos.py:484 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:486 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:490 msgid "An error occurred during this operation" msgstr "" @@ -969,6 +983,86 @@ msgstr "" msgid "password reset link" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +msgid "Repository no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +msgid "Repository read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +msgid "Repository write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +msgid "Repository admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +msgid "Repositories Group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +msgid "Repositories Group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +msgid "Repositories Group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +msgid "Repositories Group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +msgid "RhodeCode Administrator" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +msgid "Repository creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +msgid "Repository creation enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +msgid "Repository forking disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +msgid "Repository forking enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +msgid "Register disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +msgid "Register new user with RhodeCode with manual activation" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +msgid "Register new user with RhodeCode with auto activation" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +msgid "Not Reviewed" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +msgid "Approved" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +msgid "Rejected" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +msgid "Under Review" +msgstr "" + #: rhodecode/model/comment.py:110 #, python-format msgid "on line %s" @@ -978,86 +1072,6 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1163 -msgid "Repository no access" -msgstr "" - -#: rhodecode/model/db.py:1164 -msgid "Repository read access" -msgstr "" - -#: rhodecode/model/db.py:1165 -msgid "Repository write access" -msgstr "" - -#: rhodecode/model/db.py:1166 -msgid "Repository admin access" -msgstr "" - -#: rhodecode/model/db.py:1168 -msgid "Repositories Group no access" -msgstr "" - -#: rhodecode/model/db.py:1169 -msgid "Repositories Group read access" -msgstr "" - -#: rhodecode/model/db.py:1170 -msgid "Repositories Group write access" -msgstr "" - -#: rhodecode/model/db.py:1171 -msgid "Repositories Group admin access" -msgstr "" - -#: rhodecode/model/db.py:1173 -msgid "RhodeCode Administrator" -msgstr "" - -#: rhodecode/model/db.py:1174 -msgid "Repository creation disabled" -msgstr "" - -#: rhodecode/model/db.py:1175 -msgid "Repository creation enabled" -msgstr "" - -#: rhodecode/model/db.py:1176 -msgid "Repository forking disabled" -msgstr "" - -#: rhodecode/model/db.py:1177 -msgid "Repository forking enabled" -msgstr "" - -#: rhodecode/model/db.py:1178 -msgid "Register disabled" -msgstr "" - -#: rhodecode/model/db.py:1179 -msgid "Register new user with RhodeCode with manual activation" -msgstr "" - -#: rhodecode/model/db.py:1182 -msgid "Register new user with RhodeCode with auto activation" -msgstr "" - -#: rhodecode/model/db.py:1623 -msgid "Not Reviewed" -msgstr "" - -#: rhodecode/model/db.py:1624 -msgid "Approved" -msgstr "" - -#: rhodecode/model/db.py:1625 -msgid "Rejected" -msgstr "" - -#: rhodecode/model/db.py:1626 -msgid "Under Review" -msgstr "" - #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "" @@ -1558,6 +1572,7 @@ msgid "Your account must wait for activa msgstr "" #: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 #: rhodecode/templates/settings/repo_settings.html:76 @@ -1614,6 +1629,7 @@ msgid "Action" msgstr "" #: rhodecode/templates/admin/admin_log.html:7 +#: rhodecode/templates/admin/permissions/permissions.html:41 msgid "Repository" msgstr "" @@ -1635,6 +1651,75 @@ msgstr "" msgid "No actions yet" msgstr "" +#: rhodecode/templates/admin/defaults/defaults.html:5 +#: rhodecode/templates/admin/defaults/defaults.html:25 +msgid "Repositories defaults" +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:11 +msgid "Defaults" +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:35 +#: rhodecode/templates/admin/repos/repo_add_base.html:38 +#: rhodecode/templates/admin/repos/repo_edit.html:58 +msgid "Type" +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:48 +#: rhodecode/templates/admin/repos/repo_add_base.html:69 +#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/forks/fork.html:72 +#: rhodecode/templates/settings/repo_settings.html:80 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:55 +#: rhodecode/templates/admin/repos/repo_edit.html:94 +msgid "Enable statistics" +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:59 +#: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable statistics window on summary page." +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:65 +#: rhodecode/templates/admin/repos/repo_edit.html:103 +msgid "Enable downloads" +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:69 +#: rhodecode/templates/admin/repos/repo_edit.html:107 +msgid "Enable download menu on summary page." +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:75 +#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +msgid "Enable locking" +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: rhodecode/templates/admin/defaults/defaults.html:84 +#: rhodecode/templates/admin/ldap/ldap.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 +#: rhodecode/templates/admin/settings/hooks.html:73 +#: rhodecode/templates/admin/users/user_edit.html:133 +#: rhodecode/templates/admin/users/user_edit.html:178 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 +#: rhodecode/templates/settings/repo_settings.html:93 +msgid "Save" +msgstr "" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "" @@ -1707,18 +1792,6 @@ msgstr "" msgid "E-mail Attribute" msgstr "" -#: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 -#: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:133 -#: rhodecode/templates/admin/users/user_edit.html:178 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 -msgid "Save" -msgstr "" - #: rhodecode/templates/admin/notifications/notifications.html:5 #: rhodecode/templates/admin/notifications/notifications.html:9 msgid "My Notifications" @@ -1734,8 +1807,8 @@ msgid "Comments" msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:266 -#: rhodecode/templates/base/base.html:268 +#: rhodecode/templates/base/base.html:267 +#: rhodecode/templates/base/base.html:269 msgid "Pull requests" msgstr "" @@ -1777,10 +1850,6 @@ msgstr "" msgid "Anonymous access" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:41 -msgid "Repository permission" -msgstr "" - #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" "All default permissions on each repository will be reset to choosen " @@ -1789,22 +1858,39 @@ msgid "" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:50 +#: rhodecode/templates/admin/permissions/permissions.html:63 msgid "overwrite existing settings" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:55 +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#: rhodecode/templates/forks/fork.html:50 +#: rhodecode/templates/settings/repo_settings.html:48 +msgid "Repository group" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:62 +msgid "" +"All default permissions on each repository group will be reset to choosen" +" permission, note that all custom default permission on repositories " +"group will be lost" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:69 msgid "Registration" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Repository creation" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:71 +#: rhodecode/templates/admin/permissions/permissions.html:85 msgid "Repository forking" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:78 +#: rhodecode/templates/admin/permissions/permissions.html:92 #: rhodecode/templates/admin/repos/repo_edit.html:264 msgid "set" msgstr "" @@ -1836,24 +1922,11 @@ msgstr "" msgid "Optional http[s] url from which repository should be cloned." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.html:33 #: rhodecode/templates/forks/fork.html:54 msgid "Optionaly select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 -msgid "Type" -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.html:42 msgid "Type of repository to create." msgstr "" @@ -1879,15 +1952,6 @@ msgstr "" msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.html:73 msgid "add" msgstr "" @@ -1923,31 +1987,6 @@ msgstr "" msgid "Optional select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:94 -msgid "Enable statistics" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:98 -msgid "Enable statistics window on summary page." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:103 -msgid "Enable downloads" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:107 -msgid "Enable download menu on summary page." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 -msgid "Enable locking" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:116 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:126 msgid "Change owner of this repository." msgstr "" @@ -2044,9 +2083,9 @@ msgid "Active" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:330 -#: rhodecode/templates/base/base.html:332 -#: rhodecode/templates/base/base.html:334 +#: rhodecode/templates/base/base.html:331 +#: rhodecode/templates/base/base.html:333 +#: rhodecode/templates/base/base.html:335 msgid "Public journal" msgstr "" @@ -2199,9 +2238,9 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 #: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:312 -#: rhodecode/templates/base/base.html:314 -#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:315 +#: rhodecode/templates/base/base.html:317 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2862,9 +2901,9 @@ msgid "Inbox" msgstr "" #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:321 -#: rhodecode/templates/base/base.html:323 -#: rhodecode/templates/base/base.html:325 +#: rhodecode/templates/base/base.html:322 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2969,22 +3008,26 @@ msgid "permissions" msgstr "" #: rhodecode/templates/base/base.html:239 +msgid "defaults" +msgstr "" + +#: rhodecode/templates/base/base.html:240 msgid "settings" msgstr "" -#: rhodecode/templates/base/base.html:250 -#: rhodecode/templates/base/base.html:252 +#: rhodecode/templates/base/base.html:251 +#: rhodecode/templates/base/base.html:253 msgid "Followers" msgstr "" -#: rhodecode/templates/base/base.html:258 -#: rhodecode/templates/base/base.html:260 +#: rhodecode/templates/base/base.html:259 +#: rhodecode/templates/base/base.html:261 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:339 -#: rhodecode/templates/base/base.html:341 -#: rhodecode/templates/base/base.html:343 +#: rhodecode/templates/base/base.html:340 +#: rhodecode/templates/base/base.html:342 +#: rhodecode/templates/base/base.html:344 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "" @@ -3381,10 +3424,75 @@ msgstr "" msgid "Confirm to delete this user: %s" msgstr "" +#: rhodecode/templates/email_templates/changeset_comment.html:10 +msgid "New status$" +msgstr "" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is a notification from RhodeCode." msgstr "" +#: rhodecode/templates/email_templates/password_reset.html:4 +msgid "Hello" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.html:6 +msgid "We received a request to create a new password for your account." +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.html:8 +msgid "You can generate it by clicking following URL" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.html:12 +msgid "If you didn't request new password please ignore this email." +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:4 +#, python-format +msgid "" +"User %s opened pull request for repository %s and wants you to review " +"changes." +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:5 +msgid "title" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:6 +#: rhodecode/templates/pullrequests/pullrequest.html:115 +msgid "description" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:11 +msgid "revisions for reviewing" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:18 +msgid "View this pull request here" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "User %s commented on pull request #%s for repository %s" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +msgid "New status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:14 +msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/registration.html:4 +msgid "A new user have registered in RhodeCode" +msgstr "" + +#: rhodecode/templates/email_templates/registration.html:9 +msgid "View this user here" +msgstr "" + #: rhodecode/templates/errors/error_document.html:46 #, python-format msgid "You will be redirected to %s in %s seconds" @@ -3484,7 +3592,7 @@ msgid "search file list" msgstr "" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:80 +#: rhodecode/templates/shortlog/shortlog_data.html:78 msgid "add new file" msgstr "" @@ -3553,7 +3661,11 @@ msgstr "" msgid "show at revision" msgstr "" -#: rhodecode/templates/files/files_history_box.html:15 +#: rhodecode/templates/files/files_history_box.html:11 +msgid "show full history" +msgstr "" + +#: rhodecode/templates/files/files_history_box.html:16 #, fuzzy, python-format msgid "%s author" msgid_plural "%s authors" @@ -3749,10 +3861,6 @@ msgstr "" msgid "Title" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:115 -msgid "description" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" @@ -3867,7 +3975,8 @@ msgstr "" msgid "%s Shortlog" msgstr "" -#: rhodecode/templates/shortlog/shortlog.html:14 +#: rhodecode/templates/shortlog/shortlog.html:15 +#: rhodecode/templates/shortlog/shortlog.html:19 msgid "shortlog" msgstr "" @@ -3883,19 +3992,15 @@ msgstr "" msgid "author" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:33 -msgid "No commit message" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:77 +#: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:86 +#: rhodecode/templates/shortlog/shortlog_data.html:84 msgid "Push new repo" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:92 msgid "Existing repository?" msgstr ""