Mercurial > kallithea
changeset 3059:2987e2107637 beta
i18n updates
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 03 Dec 2012 03:04:07 +0100 |
| parents | 294413a5f11d |
| children | 2c8eb6cad65e |
| files | rhodecode/i18n/en/LC_MESSAGES/rhodecode.mo rhodecode/i18n/en/LC_MESSAGES/rhodecode.po rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.mo rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po rhodecode/i18n/rhodecode.pot rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.mo rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po |
| diffstat | 15 files changed, 2743 insertions(+), 1827 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Mon Dec 03 02:59:13 2012 +0100 +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Mon Dec 03 03:04:07 2012 +0100 @@ -7,7 +7,7 @@ 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 <EMAIL@ADDRESS>\n" "Language-Team: en <LL@li.org>\n" @@ -48,6 +48,7 @@ #: 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ #: 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 @@ 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 @@ 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 @@ 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 @@ msgstr "" #: rhodecode/templates/admin/admin_log.html:7 +#: rhodecode/templates/admin/permissions/permissions.html:41 msgid "Repository" msgstr "" @@ -1635,6 +1651,75 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ #: 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 ""
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Mon Dec 03 02:59:13 2012 +0100 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Mon Dec 03 03:04:07 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.1.5\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: 2012-10-02 11:32+0100\n" "Last-Translator: Vincent Duvert <vincent@duvert.net>\n" "Language-Team: fr <LL@li.org>\n" @@ -50,6 +50,7 @@ #: rhodecode/controllers/compare.py:75 #: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" @@ -185,7 +186,7 @@ msgid "Tags" msgstr "Tags" -#: 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 " @@ -281,19 +282,19 @@ msgstr "Une erreur est survenue durant l’opération de recherche." #: 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 "Dépôt %s mis à jour avec succès." #: 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 "Une erreur est survenue lors de la mise à jour du dépôt %s." #: 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 " @@ -305,14 +306,14 @@ "l’application pour rescanner les dépôts." #: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:315 +#: rhodecode/controllers/admin/repos.py:316 #, python-format msgid "deleted repository %s" msgstr "Dépôt %s supprimé" #: 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 "Erreur pendant la suppression de %s" @@ -331,7 +332,7 @@ msgstr "Le dépôt a été %s." #: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:423 +#: rhodecode/controllers/admin/repos.py:424 msgid "An error occurred during unlocking" msgstr "Une erreur est survenue durant le déverrouillage." @@ -344,6 +345,16 @@ msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt." +#: rhodecode/controllers/admin/defaults.py:96 +#, fuzzy +msgid "Default settings updated successfully" +msgstr "Mise à jour réussie des réglages LDAP" + +#: rhodecode/controllers/admin/defaults.py:110 +#, fuzzy +msgid "error occurred during update of defaults" +msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s." + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "Base" @@ -401,18 +412,23 @@ msgstr "Une erreur est survenue durant la mise à jour des réglages du LDAP." #: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 msgid "None" msgstr "Aucun" #: rhodecode/controllers/admin/permissions.py:60 +#: rhodecode/controllers/admin/permissions.py:64 msgid "Read" msgstr "Lire" #: rhodecode/controllers/admin/permissions.py:61 +#: rhodecode/controllers/admin/permissions.py:65 msgid "Write" msgstr "Écrire" #: 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 @@ -431,116 +447,116 @@ #: 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 "Administration" -#: rhodecode/controllers/admin/permissions.py:65 +#: rhodecode/controllers/admin/permissions.py:69 msgid "disabled" msgstr "Désactivé" -#: rhodecode/controllers/admin/permissions.py:67 -msgid "allowed with manual account activation" -msgstr "Autorisé avec activation manuelle du compte" - -#: rhodecode/controllers/admin/permissions.py:69 -msgid "allowed with automatic account activation" -msgstr "Autorisé avec activation automatique du compte" - #: rhodecode/controllers/admin/permissions.py:71 -#: rhodecode/controllers/admin/permissions.py:74 +msgid "allowed with manual account activation" +msgstr "Autorisé avec activation manuelle du compte" + +#: rhodecode/controllers/admin/permissions.py:73 +msgid "allowed with automatic account activation" +msgstr "Autorisé avec activation automatique du compte" + +#: rhodecode/controllers/admin/permissions.py:75 +#: rhodecode/controllers/admin/permissions.py:78 msgid "Disabled" msgstr "Interdite" -#: 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 "Autorisée" -#: rhodecode/controllers/admin/permissions.py:116 +#: rhodecode/controllers/admin/permissions.py:122 msgid "Default permissions updated successfully" msgstr "Permissions par défaut mises à jour avec succès" -#: rhodecode/controllers/admin/permissions.py:130 +#: rhodecode/controllers/admin/permissions.py:136 msgid "error occurred during update of permissions" msgstr "erreur pendant la mise à jour des permissions" -#: rhodecode/controllers/admin/repos.py:124 +#: rhodecode/controllers/admin/repos.py:125 msgid "--REMOVE FORK--" msgstr "[Pas un fork]" -#: rhodecode/controllers/admin/repos.py:193 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s from %s" msgstr "Le dépôt %s a été créé depuis %s." -#: rhodecode/controllers/admin/repos.py:197 +#: rhodecode/controllers/admin/repos.py:198 #, python-format msgid "created repository %s" msgstr "Le dépôt %s a été créé." -#: rhodecode/controllers/admin/repos.py:228 +#: rhodecode/controllers/admin/repos.py:229 #, python-format msgid "error occurred during creation of repository %s" msgstr "Une erreur est survenue durant la création du dépôt %s." -#: rhodecode/controllers/admin/repos.py:320 +#: rhodecode/controllers/admin/repos.py:321 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés." -#: rhodecode/controllers/admin/repos.py:349 +#: rhodecode/controllers/admin/repos.py:350 msgid "An error occurred during deletion of repository user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur du dépôt." -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:369 msgid "An error occurred during deletion of repository users groups" msgstr "" "Une erreur est survenue durant la suppression du groupe d’utilisateurs de" " ce dépôt." -#: rhodecode/controllers/admin/repos.py:386 +#: rhodecode/controllers/admin/repos.py:387 msgid "An error occurred during deletion of repository stats" msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt." -#: rhodecode/controllers/admin/repos.py:403 +#: rhodecode/controllers/admin/repos.py:404 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: rhodecode/controllers/admin/repos.py:443 +#: rhodecode/controllers/admin/repos.py:444 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour." -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:448 msgid "An error occurred during setting this repository in public journal" msgstr "" "Une erreur est survenue durant la configuration du journal public pour ce" " dépôt." -#: rhodecode/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 "Jeton d’authentification incorrect." -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:466 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés." -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:468 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante." -#: rhodecode/controllers/admin/repos.py:483 +#: rhodecode/controllers/admin/repos.py:484 msgid "Nothing" msgstr "[Aucun dépôt]" -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:486 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:490 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." @@ -840,14 +856,14 @@ #: rhodecode/lib/helpers.py:640 #, fuzzy, python-format msgid "fork name %s" -msgstr "Nom du fork" +msgstr "Nom du fork %s" #: rhodecode/lib/helpers.py:653 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" -msgstr "Requête de pull nº%s" +msgstr "Requête de pull #%s" #: rhodecode/lib/helpers.py:659 msgid "[deleted] repository" @@ -1004,6 +1020,86 @@ msgid "password reset link" msgstr "Réinitialisation du mot de passe" +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +msgid "Repository no access" +msgstr "Aucun accès au dépôt" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +msgid "Repository read access" +msgstr "Accès en lecture au dépôt" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +msgid "Repository write access" +msgstr "Accès en écriture au dépôt" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +msgid "Repository admin access" +msgstr "Accès administrateur au dépôt" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +msgid "Repositories Group no access" +msgstr "Aucun accès au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +msgid "Repositories Group read access" +msgstr "Accès en lecture au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +msgid "Repositories Group write access" +msgstr "Accès en écriture au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +msgid "Repositories Group admin access" +msgstr "Accès administrateur au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +msgid "RhodeCode Administrator" +msgstr "Administrateur RhodeCode" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +msgid "Repository creation disabled" +msgstr "Création de dépôt désactivée" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +msgid "Repository creation enabled" +msgstr "Création de dépôt activée" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +msgid "Repository forking disabled" +msgstr "Fork de dépôt désactivé" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +msgid "Repository forking enabled" +msgstr "Fork de dépôt activé" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +msgid "Register disabled" +msgstr "Enregistrement désactivé" + +#: 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 "Enregistrer un nouvel utilisateur Rhodecode manuellement activé" + +#: 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 "Enregistrer un nouvel utilisateur Rhodecode auto-activé" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +msgid "Not Reviewed" +msgstr "Pas encore relue" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +msgid "Approved" +msgstr "Approuvée " + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +msgid "Rejected" +msgstr "Rejetée" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +msgid "Under Review" +msgstr "En cours de relecture" + #: rhodecode/model/comment.py:110 #, python-format msgid "on line %s" @@ -1013,86 +1109,6 @@ msgid "[Mention]" msgstr "[Mention]" -#: rhodecode/model/db.py:1163 -msgid "Repository no access" -msgstr "Aucun accès au dépôt" - -#: rhodecode/model/db.py:1164 -msgid "Repository read access" -msgstr "Accès en lecture au dépôt" - -#: rhodecode/model/db.py:1165 -msgid "Repository write access" -msgstr "Accès en écriture au dépôt" - -#: rhodecode/model/db.py:1166 -msgid "Repository admin access" -msgstr "Accès administrateur au dépôt" - -#: rhodecode/model/db.py:1168 -msgid "Repositories Group no access" -msgstr "Aucun accès au groupe de dépôts" - -#: rhodecode/model/db.py:1169 -msgid "Repositories Group read access" -msgstr "Accès en lecture au groupe de dépôts" - -#: rhodecode/model/db.py:1170 -msgid "Repositories Group write access" -msgstr "Accès en écriture au groupe de dépôts" - -#: rhodecode/model/db.py:1171 -msgid "Repositories Group admin access" -msgstr "Accès administrateur au groupe de dépôts" - -#: rhodecode/model/db.py:1173 -msgid "RhodeCode Administrator" -msgstr "Administrateur RhodeCode" - -#: rhodecode/model/db.py:1174 -msgid "Repository creation disabled" -msgstr "Création de dépôt désactivée" - -#: rhodecode/model/db.py:1175 -msgid "Repository creation enabled" -msgstr "Création de dépôt activée" - -#: rhodecode/model/db.py:1176 -msgid "Repository forking disabled" -msgstr "Fork de dépôt désactivé" - -#: rhodecode/model/db.py:1177 -msgid "Repository forking enabled" -msgstr "Fork de dépôt activé" - -#: rhodecode/model/db.py:1178 -msgid "Register disabled" -msgstr "Enregistrement désactivé" - -#: rhodecode/model/db.py:1179 -msgid "Register new user with RhodeCode with manual activation" -msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé" - -#: rhodecode/model/db.py:1182 -msgid "Register new user with RhodeCode with auto activation" -msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" - -#: rhodecode/model/db.py:1623 -msgid "Not Reviewed" -msgstr "Pas encore relue" - -#: rhodecode/model/db.py:1624 -msgid "Approved" -msgstr "Approuvée " - -#: rhodecode/model/db.py:1625 -msgid "Rejected" -msgstr "Rejetée" - -#: rhodecode/model/db.py:1626 -msgid "Under Review" -msgstr "En cours de relecture" - #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "Veuillez entrer un identifiant" @@ -1114,32 +1130,32 @@ #: rhodecode/model/notification.py:220 #, fuzzy, python-format msgid "commented on commit at %(when)s" -msgstr "a posté un commentaire sur le commit" +msgstr "a posté un commentaire sur le commit %(when)s" #: rhodecode/model/notification.py:221 #, fuzzy, python-format msgid "sent message at %(when)s" -msgstr "a envoyé un message" +msgstr "a envoyé un message %(when)s" #: rhodecode/model/notification.py:222 #, fuzzy, python-format msgid "mentioned you at %(when)s" -msgstr "vous a mentioné" +msgstr "vous a mentioné %(when)s" #: rhodecode/model/notification.py:223 #, fuzzy, python-format msgid "registered in RhodeCode at %(when)s" -msgstr "s’est enregistré sur RhodeCode" +msgstr "s’est enregistré sur RhodeCode %(when)s" #: rhodecode/model/notification.py:224 #, fuzzy, python-format msgid "opened new pull request at %(when)s" -msgstr "a ouvert une nouvelle requête de pull" +msgstr "a ouvert une nouvelle requête de pull %(when)s" #: rhodecode/model/notification.py:225 #, fuzzy, python-format msgid "commented on pull request at %(when)s" -msgstr "a commenté sur la requête de pull" +msgstr "a commenté sur la requête de pull %(when)s" #: rhodecode/model/pull_request.py:90 #, python-format @@ -1611,6 +1627,7 @@ msgstr "Votre compte utilisateur devra être activé par un administrateur." #: 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 @@ -1667,6 +1684,7 @@ msgstr "Action" #: rhodecode/templates/admin/admin_log.html:7 +#: rhodecode/templates/admin/permissions/permissions.html:41 msgid "Repository" msgstr "Dépôt" @@ -1688,6 +1706,79 @@ msgid "No actions yet" msgstr "Aucune action n’a été enregistrée pour le moment." +#: rhodecode/templates/admin/defaults/defaults.html:5 +#: rhodecode/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repositories defaults" +msgstr "Groupes de dépôts" + +#: rhodecode/templates/admin/defaults/defaults.html:11 +#, fuzzy +msgid "Defaults" +msgstr "[Par défaut]" + +#: 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 "Type" + +#: 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 "" +"Les dépôts privés sont visibles seulement par les utilisateurs ajoutés " +"comme collaborateurs." + +#: rhodecode/templates/admin/defaults/defaults.html:55 +#: rhodecode/templates/admin/repos/repo_edit.html:94 +msgid "Enable statistics" +msgstr "Activer les statistiques" + +#: rhodecode/templates/admin/defaults/defaults.html:59 +#: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable statistics window on summary page." +msgstr "Afficher les statistiques sur la page du dépôt." + +#: rhodecode/templates/admin/defaults/defaults.html:65 +#: rhodecode/templates/admin/repos/repo_edit.html:103 +msgid "Enable downloads" +msgstr "Activer les téléchargements" + +#: rhodecode/templates/admin/defaults/defaults.html:69 +#: rhodecode/templates/admin/repos/repo_edit.html:107 +msgid "Enable download menu on summary page." +msgstr "Afficher le menu de téléchargements sur la page du dépôt." + +#: rhodecode/templates/admin/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 "Activer le verrouillage" + +#: rhodecode/templates/admin/defaults/defaults.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "Activer le verrouillage lors d’un pull sur le dépôt." + +#: 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 "Enregistrer" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "Administration LDAP" @@ -1760,18 +1851,6 @@ msgid "E-mail Attribute" msgstr "Attribut pour l’e-mail" -#: 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 "Enregistrer" - #: rhodecode/templates/admin/notifications/notifications.html:5 #: rhodecode/templates/admin/notifications/notifications.html:9 msgid "My Notifications" @@ -1786,8 +1865,8 @@ msgstr "Commentaires" #: 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 "Requêtes de pull" @@ -1829,10 +1908,6 @@ msgid "Anonymous access" msgstr "Accès anonyme" -#: rhodecode/templates/admin/permissions/permissions.html:41 -msgid "Repository permission" -msgstr "Permissions du dépôt" - #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" "All default permissions on each repository will be reset to choosen " @@ -1844,22 +1919,43 @@ "perdues." #: rhodecode/templates/admin/permissions/permissions.html:50 +#: rhodecode/templates/admin/permissions/permissions.html:63 msgid "overwrite existing settings" msgstr "Écraser les permissions existantes" #: 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 "Groupe de dépôt" + +#: rhodecode/templates/admin/permissions/permissions.html:62 +#, fuzzy +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 "" +"Les permissions par défaut de chaque dépôt vont être remplacées par la " +"permission choisie. Toutes les permissions par défaut des dépôts seront " +"perdues." + +#: rhodecode/templates/admin/permissions/permissions.html:69 msgid "Registration" msgstr "Enregistrement" -#: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Repository creation" msgstr "Création de dépôt" -#: rhodecode/templates/admin/permissions/permissions.html:71 +#: rhodecode/templates/admin/permissions/permissions.html:85 msgid "Repository forking" msgstr "Fork de dépôt" -#: 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 "Définir" @@ -1891,24 +1987,11 @@ msgid "Optional http[s] url from which repository should be cloned." msgstr "URL http(s) depuis laquelle le dépôt doit être cloné." -#: 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 "Groupe de dépôt" - #: 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 "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." -#: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 -msgid "Type" -msgstr "Type" - #: rhodecode/templates/admin/repos/repo_add_base.html:42 msgid "Type of repository to create." msgstr "Type de dépôt à créer." @@ -1938,17 +2021,6 @@ "Gardez cette description précise et concise. Utilisez un fichier README " "pour des descriptions plus détaillées." -#: rhodecode/templates/admin/repos/repo_add_base.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 "" -"Les dépôts privés sont visibles seulement par les utilisateurs ajoutés " -"comme collaborateurs." - #: rhodecode/templates/admin/repos/repo_add_base.html:73 msgid "add" msgstr "Ajouter" @@ -1984,31 +2056,6 @@ msgid "Optional select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:94 -msgid "Enable statistics" -msgstr "Activer les statistiques" - -#: rhodecode/templates/admin/repos/repo_edit.html:98 -msgid "Enable statistics window on summary page." -msgstr "Afficher les statistiques sur la page du dépôt." - -#: rhodecode/templates/admin/repos/repo_edit.html:103 -msgid "Enable downloads" -msgstr "Activer les téléchargements" - -#: rhodecode/templates/admin/repos/repo_edit.html:107 -msgid "Enable download menu on summary page." -msgstr "Afficher le menu de téléchargements sur la page du dépôt." - -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 -msgid "Enable locking" -msgstr "Activer le verrouillage" - -#: rhodecode/templates/admin/repos/repo_edit.html:116 -msgid "Enable lock-by-pulling on repository." -msgstr "Activer le verrouillage lors d’un pull sur le dépôt." - #: rhodecode/templates/admin/repos/repo_edit.html:126 msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." @@ -2108,9 +2155,9 @@ msgstr "Actif" #: 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 "Journal public" @@ -2276,9 +2323,9 @@ #: 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 @@ -2377,7 +2424,7 @@ #, fuzzy, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" -msgstr[0] "Voulez-vous vraiment supprimer ce dépôt ?" +msgstr[0] "" msgstr[1] "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 @@ -2961,9 +3008,9 @@ msgstr "Boîte de réception" #: 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 @@ -3068,22 +3115,27 @@ msgstr "Permissions" #: rhodecode/templates/base/base.html:239 +#, fuzzy +msgid "defaults" +msgstr "[Par défaut]" + +#: rhodecode/templates/base/base.html:240 msgid "settings" msgstr "Réglages" -#: 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 "Followers" -#: 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 "Forks" -#: 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 "Rechercher" @@ -3325,8 +3377,8 @@ #, fuzzy, python-format msgid "%s file changed" msgid_plural "%s files changed" -msgstr[0] "fichié modifié" -msgstr[1] "" +msgstr[0] "%s fichié modifié" +msgstr[1] "%s fichié modifié" #: rhodecode/templates/changeset/changeset.html:113 #: rhodecode/templates/compare/compare_diff.html:46 @@ -3334,8 +3386,8 @@ #, fuzzy, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" -msgstr[0] "%s fichiers affectés avec %s insertions et %s suppressions :" -msgstr[1] "" +msgstr[0] "%s fichiers affectés avec %s insertions et %s suppressions" +msgstr[1] "%s fichiers affectés avec %s insertions et %s suppressions" #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." @@ -3430,8 +3482,8 @@ #, fuzzy, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" -msgstr[0] "Afficher les commentaires" -msgstr[1] "" +msgstr[0] "Afficher %s les commentaires" +msgstr[1] "Afficher %s les commentaires" #: rhodecode/templates/compare/compare_diff.html:52 #: rhodecode/templates/pullrequests/pullrequest_show.html:84 @@ -3490,11 +3542,81 @@ msgid "Confirm to delete this user: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" +#: rhodecode/templates/email_templates/changeset_comment.html:10 +#, fuzzy +msgid "New status$" +msgstr "Modifier le statut" + #: rhodecode/templates/email_templates/main.html:8 #, fuzzy msgid "This is a notification from RhodeCode." msgstr "Ceci est une notification de RhodeCode." +#: 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 +#, fuzzy +msgid "title" +msgstr "Titre" + +#: rhodecode/templates/email_templates/pull_request.html:6 +#: rhodecode/templates/pullrequests/pullrequest.html:115 +msgid "description" +msgstr "Description" + +#: rhodecode/templates/email_templates/pull_request.html:11 +msgid "revisions for reviewing" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:18 +#, fuzzy +msgid "View this pull request here" +msgstr "Ajouter un relecteur à cette requête de pull." + +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "User %s commented on pull request #%s for repository %s" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +msgid "New status" +msgstr "Modifier le statut" + +#: rhodecode/templates/email_templates/pull_request_comment.html:14 +msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/registration.html:4 +#, fuzzy +msgid "A new user have registered in RhodeCode" +msgstr "Vous vous êtes inscrits avec succès à RhodeCode" + +#: 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" @@ -3594,7 +3716,7 @@ msgstr "Rechercher un fichier" #: 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 "Ajouter un fichier" @@ -3662,7 +3784,12 @@ msgid "show at revision" msgstr "Afficher à la révision" -#: rhodecode/templates/files/files_history_box.html:15 +#: rhodecode/templates/files/files_history_box.html:11 +#, fuzzy +msgid "show full history" +msgstr "Chargement de la liste des fichiers…" + +#: rhodecode/templates/files/files_history_box.html:16 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -3859,10 +3986,6 @@ msgid "Title" msgstr "Titre" -#: rhodecode/templates/pullrequests/pullrequest.html:115 -msgid "description" -msgstr "Description" - #: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "Envoyer la requête de pull" @@ -3977,7 +4100,8 @@ msgid "%s Shortlog" msgstr "Résumé de %s" -#: rhodecode/templates/shortlog/shortlog.html:14 +#: rhodecode/templates/shortlog/shortlog.html:15 +#: rhodecode/templates/shortlog/shortlog.html:19 msgid "shortlog" msgstr "Résumé" @@ -3993,19 +4117,15 @@ msgid "author" msgstr "Auteur" -#: rhodecode/templates/shortlog/shortlog_data.html:33 -msgid "No commit message" -msgstr "Pas de message de commit" - -#: rhodecode/templates/shortlog/shortlog_data.html:77 +#: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" msgstr "Ajouter ou téléverser des fichiers directement via RhodeCode…" -#: rhodecode/templates/shortlog/shortlog_data.html:86 +#: rhodecode/templates/shortlog/shortlog_data.html:84 msgid "Push new repo" msgstr "Pusher le nouveau dépôt" -#: rhodecode/templates/shortlog/shortlog_data.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:92 msgid "Existing repository?" msgstr "Le dépôt existe déjà ?" @@ -4036,7 +4156,7 @@ #: rhodecode/templates/summary/summary.html:70 #, fuzzy, python-format msgid "Repository locked by %s" -msgstr "Ce dépôt n’est pas verrouillé." +msgstr "Ce dépôt n’est pas verrouillé %s." #: rhodecode/templates/summary/summary.html:72 #, fuzzy
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Mon Dec 03 02:59:13 2012 +0100 +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Mon Dec 03 03:04:07 2012 +0100 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\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: 2012-10-27 15:06+0900\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: ja <LL@li.org>\n" @@ -43,7 +43,7 @@ #: rhodecode/controllers/pullrequests.py:411 #, fuzzy, python-format msgid "Status change -> %s" -msgstr "最後の変更時刻" +msgstr "" #: rhodecode/controllers/changeset.py:346 msgid "" @@ -53,6 +53,7 @@ #: rhodecode/controllers/compare.py:75 #: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "まだ変更がありません" @@ -184,7 +185,7 @@ 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 " @@ -274,19 +275,19 @@ 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 "リポジトリ %s の更新に成功しました" #: 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 "リポジトリ %s の更新中にエラーが発生しました" #: 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 " @@ -297,14 +298,14 @@ "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" #: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:315 +#: rhodecode/controllers/admin/repos.py:316 #, python-format msgid "deleted repository %s" msgstr "リポジトリ %s を削除しました" #: 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 "リポジトリ %s の削除中にエラーが発生しました" @@ -322,10 +323,10 @@ #: rhodecode/controllers/settings.py:184 #, fuzzy, python-format msgid "Repository has been %s" -msgstr "リポジトリ %s を %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 "アンロック時にエラーが発生しました" @@ -338,6 +339,16 @@ msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" +#: rhodecode/controllers/admin/defaults.py:96 +#, fuzzy +msgid "Default settings updated successfully" +msgstr "LDAP設定を更新しました" + +#: rhodecode/controllers/admin/defaults.py:110 +#, fuzzy +msgid "error occurred during update of defaults" +msgstr "ユーザー %s の更新中にエラーが発生しました" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "BASE" @@ -395,18 +406,23 @@ msgstr "LDAP設定の更新中にエラーが発生しました" #: 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 @@ -425,112 +441,112 @@ #: 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 +#: rhodecode/controllers/admin/permissions.py:69 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" -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 "リポジトリ %s を %s から作成" -#: rhodecode/controllers/admin/repos.py:197 +#: rhodecode/controllers/admin/repos.py:198 #, python-format msgid "created repository %s" msgstr "リポジトリ %s を作成しました" -#: rhodecode/controllers/admin/repos.py:228 +#: rhodecode/controllers/admin/repos.py:229 #, python-format msgid "error occurred during creation of repository %s" msgstr "リポジトリ %s を作成中にエラーが発生しました" -#: 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 "%s リポジトリを %s のフォークとして印をつける" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:490 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" @@ -818,7 +834,7 @@ #: rhodecode/lib/helpers.py:640 #, fuzzy, python-format msgid "fork name %s" -msgstr "フォーク名 " +msgstr "" #: rhodecode/lib/helpers.py:653 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 @@ -976,6 +992,86 @@ 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" @@ -985,86 +1081,6 @@ msgid "[Mention]" msgstr "[Mention]" -#: 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 "ログイン名を入力してください" @@ -1086,7 +1102,7 @@ #: rhodecode/model/notification.py:220 #, fuzzy, python-format msgid "commented on commit at %(when)s" -msgstr "コミットに対するコメント" +msgstr "" #: rhodecode/model/notification.py:221 #, python-format @@ -1106,12 +1122,12 @@ #: rhodecode/model/notification.py:224 #, fuzzy, python-format msgid "opened new pull request at %(when)s" -msgstr "新しいプルリクエストを作成" +msgstr "" #: rhodecode/model/notification.py:225 #, fuzzy, python-format msgid "commented on pull request at %(when)s" -msgstr "プルリクエストに[コメント]" +msgstr "" #: rhodecode/model/pull_request.py:90 #, python-format @@ -1568,6 +1584,7 @@ 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 @@ -1624,6 +1641,7 @@ msgstr "アクション" #: rhodecode/templates/admin/admin_log.html:7 +#: rhodecode/templates/admin/permissions/permissions.html:41 msgid "Repository" msgstr "リポジトリ" @@ -1645,6 +1663,77 @@ msgid "No actions yet" msgstr "まだアクションがありません" +#: rhodecode/templates/admin/defaults/defaults.html:5 +#: rhodecode/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repositories defaults" +msgstr "リポジトリグループ" + +#: rhodecode/templates/admin/defaults/defaults.html:11 +#, fuzzy +msgid "Defaults" +msgstr "default" + +#: 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 "LDAP管理" @@ -1717,18 +1806,6 @@ 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" @@ -1743,8 +1820,8 @@ 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 "プルリクエスト" @@ -1786,10 +1863,6 @@ 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 " @@ -1798,22 +1871,39 @@ 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 "保存" @@ -1845,24 +1935,11 @@ msgid "Optional http[s] url from which repository should be cloned." msgstr "オプション：クローンするリポジトリのHTTP[S]のURLを指定します" -#: 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 "作成するリポジトリのタイプを指定します" @@ -1888,15 +1965,6 @@ msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" -#: 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 "追加" @@ -1932,31 +2000,6 @@ 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 "リポジトリの所有者を変更" @@ -2054,9 +2097,9 @@ 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 "公開ジャーナル" @@ -2211,9 +2254,9 @@ #: 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 @@ -2310,7 +2353,7 @@ #, fuzzy, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" -msgstr[0] "このリポジトリを削除しますか？" +msgstr[0] "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 msgid "There are no repositories groups yet" @@ -2877,9 +2920,9 @@ 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 @@ -2986,22 +3029,27 @@ msgstr "権限" #: rhodecode/templates/base/base.html:239 +#, fuzzy +msgid "defaults" +msgstr "default" + +#: 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 "検索" @@ -3240,7 +3288,7 @@ #, fuzzy, python-format msgid "%s file changed" msgid_plural "%s files changed" -msgstr[0] "変更されたファイル" +msgstr[0] "" #: rhodecode/templates/changeset/changeset.html:113 #: rhodecode/templates/compare/compare_diff.html:46 @@ -3339,7 +3387,7 @@ #, fuzzy, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" -msgstr[0] "インラインコメントを表示" +msgstr[0] "" #: rhodecode/templates/compare/compare_diff.html:52 #: rhodecode/templates/pullrequests/pullrequest_show.html:84 @@ -3398,11 +3446,81 @@ msgid "Confirm to delete this user: %s" msgstr "このユーザーを本当に削除してよろしいですか？: %s" +#: rhodecode/templates/email_templates/changeset_comment.html:10 +#, fuzzy +msgid "New status$" +msgstr "ステータスを変更する" + #: rhodecode/templates/email_templates/main.html:8 #, fuzzy msgid "This is a notification from RhodeCode." msgstr "RhodeCodeからの通知があります" +#: 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 +#, fuzzy +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 +#, fuzzy +msgid "View this pull request here" +msgstr "このプルリクエストにレビュアーを追加" + +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "User %s commented on pull request #%s for repository %s" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +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 +#, fuzzy +msgid "A new user have registered in RhodeCode" +msgstr "rhodecodeへの登録を受け付けました" + +#: 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" @@ -3502,7 +3620,7 @@ 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 "新しいファイルを追加" @@ -3570,7 +3688,12 @@ msgid "show at revision" msgstr "このリビジョンを見る" -#: rhodecode/templates/files/files_history_box.html:15 +#: rhodecode/templates/files/files_history_box.html:11 +#, fuzzy +msgid "show full history" +msgstr "ファイル一覧を読み込み中..." + +#: rhodecode/templates/files/files_history_box.html:16 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -3766,10 +3889,6 @@ msgid "Title" msgstr "タイトル" -#: rhodecode/templates/pullrequests/pullrequest.html:115 -msgid "description" -msgstr "説明" - #: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "プルリクエストを送る" @@ -3884,7 +4003,8 @@ msgid "%s Shortlog" msgstr "%s 短いログ" -#: rhodecode/templates/shortlog/shortlog.html:14 +#: rhodecode/templates/shortlog/shortlog.html:15 +#: rhodecode/templates/shortlog/shortlog.html:19 msgid "shortlog" msgstr "ログ" @@ -3900,19 +4020,15 @@ 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経由で直接ファイルを追加またはアップロード" -#: 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 "存在するリポジトリをプッシュ" @@ -3943,7 +4059,7 @@ #: rhodecode/templates/summary/summary.html:70 #, fuzzy, python-format msgid "Repository locked by %s" -msgstr "リポジトリはロックされていません" +msgstr "" #: rhodecode/templates/summary/summary.html:72 #, fuzzy
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Mon Dec 03 02:59:13 2012 +0100 +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Mon Dec 03 03:04:07 2012 +0100 @@ -8,7 +8,7 @@ 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: 2012-11-25 03:42+0200\n" "Last-Translator: Nemo <areczek01@gmail.com>\n" "Language-Team: Test\n" @@ -52,6 +52,7 @@ #: rhodecode/controllers/compare.py:75 #: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" @@ -187,7 +188,7 @@ msgid "Tags" msgstr "Etykiety" -#: 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 " @@ -279,19 +280,19 @@ msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" #: 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 "Repozytorium %s zostało pomyślnie zaktualizowane" #: 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 "wystąpił błąd podczas aktualizacji repozytorium %s" #: 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 " @@ -303,14 +304,14 @@ "ponownie przeskanować repozytoria" #: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:315 +#: rhodecode/controllers/admin/repos.py:316 #, python-format msgid "deleted repository %s" msgstr "usunięte repozytorium %s" #: 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 "Wystąpił błąd podczas usuwania %s" @@ -329,7 +330,7 @@ msgstr "Repozytoriów jest %s" #: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:423 +#: rhodecode/controllers/admin/repos.py:424 msgid "An error occurred during unlocking" msgstr "Wystąpił błąd podczas odblokowywania" @@ -342,6 +343,16 @@ msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" +#: rhodecode/controllers/admin/defaults.py:96 +#, fuzzy +msgid "Default settings updated successfully" +msgstr "Ustawienia LDAP zostały zaktualizowane" + +#: rhodecode/controllers/admin/defaults.py:110 +#, fuzzy +msgid "error occurred during update of defaults" +msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "PODSTAWA" @@ -399,18 +410,23 @@ msgstr "Wystąpił błąd podczas aktualizacji ustawień ldap" #: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 msgid "None" msgstr "Brak" #: rhodecode/controllers/admin/permissions.py:60 +#: rhodecode/controllers/admin/permissions.py:64 msgid "Read" msgstr "Odczyt" #: rhodecode/controllers/admin/permissions.py:61 +#: rhodecode/controllers/admin/permissions.py:65 msgid "Write" msgstr "Zapis" #: 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 @@ -429,112 +445,112 @@ #: 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 "Administracja" -#: rhodecode/controllers/admin/permissions.py:65 +#: rhodecode/controllers/admin/permissions.py:69 msgid "disabled" msgstr "wyłączona" -#: rhodecode/controllers/admin/permissions.py:67 -msgid "allowed with manual account activation" -msgstr "dozwolona z ręczną aktywacją konta" - -#: rhodecode/controllers/admin/permissions.py:69 -msgid "allowed with automatic account activation" -msgstr "dozwolona z automatyczną aktywacją konta" - #: rhodecode/controllers/admin/permissions.py:71 -#: rhodecode/controllers/admin/permissions.py:74 +msgid "allowed with manual account activation" +msgstr "dozwolona z ręczną aktywacją konta" + +#: rhodecode/controllers/admin/permissions.py:73 +msgid "allowed with automatic account activation" +msgstr "dozwolona z automatyczną aktywacją konta" + +#: rhodecode/controllers/admin/permissions.py:75 +#: rhodecode/controllers/admin/permissions.py:78 msgid "Disabled" msgstr "Wyłączone" -#: 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 "Włączone" -#: rhodecode/controllers/admin/permissions.py:116 +#: rhodecode/controllers/admin/permissions.py:122 msgid "Default permissions updated successfully" msgstr "Domyślne uprawnienia zaktualizowane pomyślnie" -#: rhodecode/controllers/admin/permissions.py:130 +#: rhodecode/controllers/admin/permissions.py:136 msgid "error occurred during update of permissions" msgstr "wystąpił błąd podczas aktualizacji uprawnień" -#: rhodecode/controllers/admin/repos.py:124 +#: rhodecode/controllers/admin/repos.py:125 msgid "--REMOVE FORK--" msgstr "--USUŃ ROZGAŁĘZIENIE--" -#: rhodecode/controllers/admin/repos.py:193 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: rhodecode/controllers/admin/repos.py:197 +#: rhodecode/controllers/admin/repos.py:198 #, python-format msgid "created repository %s" msgstr "utworzone repozytorium %s" -#: rhodecode/controllers/admin/repos.py:228 +#: rhodecode/controllers/admin/repos.py:229 #, python-format msgid "error occurred during creation of repository %s" msgstr "wystąpił błąd podczas tworzenia repozytorium %s" -#: rhodecode/controllers/admin/repos.py:320 +#: rhodecode/controllers/admin/repos.py:321 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" -#: rhodecode/controllers/admin/repos.py:349 +#: rhodecode/controllers/admin/repos.py:350 msgid "An error occurred during deletion of repository user" msgstr "Wystąpił błąd podczas usunięcia użytkownika z repozytorium" -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:369 msgid "An error occurred during deletion of repository users groups" msgstr "Wystąpił błąd podczas usunięcia grupy użytkowników z repozytorium" -#: rhodecode/controllers/admin/repos.py:386 +#: rhodecode/controllers/admin/repos.py:387 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: rhodecode/controllers/admin/repos.py:403 +#: rhodecode/controllers/admin/repos.py:404 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: rhodecode/controllers/admin/repos.py:443 +#: rhodecode/controllers/admin/repos.py:444 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:448 msgid "An error occurred during setting this repository in public journal" msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" -#: 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 "Niezgodność tokenu" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:466 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:468 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:483 +#: rhodecode/controllers/admin/repos.py:484 msgid "Nothing" msgstr "Brak" -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:486 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:490 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" @@ -998,6 +1014,86 @@ msgid "password reset link" msgstr "łącze resetowania hasła" +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +msgid "Repository no access" +msgstr "Brak dostępu do repozytorium" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +msgid "Repository read access" +msgstr "Repozytorium do odczytu" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +msgid "Repository write access" +msgstr "Repozytorium do zapisu" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +msgid "Repository admin access" +msgstr "Administracja dostępu do repozytorium" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +msgid "Repositories Group no access" +msgstr "Grupy repozytoriów brak dostępu" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +msgid "Repositories Group read access" +msgstr "Grupy repozytoriów dostęp do odczytu" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +msgid "Repositories Group write access" +msgstr "Grupy repozytoriów dostęp do zapisu" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +msgid "Repositories Group admin access" +msgstr "Repozytoria Grupy dostęp administratora" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +msgid "RhodeCode Administrator" +msgstr "Administrator Repo" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +msgid "Repository creation disabled" +msgstr "Repozytorium wyłączone" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +msgid "Repository creation enabled" +msgstr "Repozytorium włączone" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +msgid "Repository forking disabled" +msgstr "Rozwidlenie repozytorium wyłączone" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +msgid "Repository forking enabled" +msgstr "Rozwidlenie repozytorium włączone" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +msgid "Register disabled" +msgstr "Rejestracja wyłączona" + +#: 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 "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" + +#: 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 "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +msgid "Not Reviewed" +msgstr "Brak Korekty" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +msgid "Approved" +msgstr "Zaakceptowano" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +msgid "Rejected" +msgstr "Odrzucono" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +msgid "Under Review" +msgstr "Objęty Przeglądem" + #: rhodecode/model/comment.py:110 #, python-format msgid "on line %s" @@ -1007,86 +1103,6 @@ msgid "[Mention]" msgstr "[Wymieniony]" -#: rhodecode/model/db.py:1163 -msgid "Repository no access" -msgstr "Brak dostępu do repozytorium" - -#: rhodecode/model/db.py:1164 -msgid "Repository read access" -msgstr "Repozytorium do odczytu" - -#: rhodecode/model/db.py:1165 -msgid "Repository write access" -msgstr "Repozytorium do zapisu" - -#: rhodecode/model/db.py:1166 -msgid "Repository admin access" -msgstr "Administracja dostępu do repozytorium" - -#: rhodecode/model/db.py:1168 -msgid "Repositories Group no access" -msgstr "Grupy repozytoriów brak dostępu" - -#: rhodecode/model/db.py:1169 -msgid "Repositories Group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" - -#: rhodecode/model/db.py:1170 -msgid "Repositories Group write access" -msgstr "Grupy repozytoriów dostęp do zapisu" - -#: rhodecode/model/db.py:1171 -msgid "Repositories Group admin access" -msgstr "Repozytoria Grupy dostęp administratora" - -#: rhodecode/model/db.py:1173 -msgid "RhodeCode Administrator" -msgstr "Administrator Repo" - -#: rhodecode/model/db.py:1174 -msgid "Repository creation disabled" -msgstr "Repozytorium wyłączone" - -#: rhodecode/model/db.py:1175 -msgid "Repository creation enabled" -msgstr "Repozytorium włączone" - -#: rhodecode/model/db.py:1176 -msgid "Repository forking disabled" -msgstr "Rozwidlenie repozytorium wyłączone" - -#: rhodecode/model/db.py:1177 -msgid "Repository forking enabled" -msgstr "Rozwidlenie repozytorium włączone" - -#: rhodecode/model/db.py:1178 -msgid "Register disabled" -msgstr "Rejestracja wyłączona" - -#: rhodecode/model/db.py:1179 -msgid "Register new user with RhodeCode with manual activation" -msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" - -#: rhodecode/model/db.py:1182 -msgid "Register new user with RhodeCode with auto activation" -msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" - -#: rhodecode/model/db.py:1623 -msgid "Not Reviewed" -msgstr "Brak Korekty" - -#: rhodecode/model/db.py:1624 -msgid "Approved" -msgstr "Zaakceptowano" - -#: rhodecode/model/db.py:1625 -msgid "Rejected" -msgstr "Odrzucono" - -#: rhodecode/model/db.py:1626 -msgid "Under Review" -msgstr "Objęty Przeglądem" - #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "Wpisz login" @@ -1599,6 +1615,7 @@ msgstr "Twoje konto musi zostać aktywowane przez administratora" #: 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 @@ -1655,6 +1672,7 @@ msgstr "Działanie" #: rhodecode/templates/admin/admin_log.html:7 +#: rhodecode/templates/admin/permissions/permissions.html:41 msgid "Repository" msgstr "Repozytorium" @@ -1676,6 +1694,79 @@ msgid "No actions yet" msgstr "Brak akcji" +#: rhodecode/templates/admin/defaults/defaults.html:5 +#: rhodecode/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repositories defaults" +msgstr "grupy w repozytorium" + +#: rhodecode/templates/admin/defaults/defaults.html:11 +#, fuzzy +msgid "Defaults" +msgstr "domyślne" + +#: 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 "Typ" + +#: 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 "" +"Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych " +"jako współpracownicy." + +#: rhodecode/templates/admin/defaults/defaults.html:55 +#: rhodecode/templates/admin/repos/repo_edit.html:94 +msgid "Enable statistics" +msgstr "Włącz statystyki" + +#: rhodecode/templates/admin/defaults/defaults.html:59 +#: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable statistics window on summary page." +msgstr "Włącz okno statystyk na stronie podsumowania." + +#: rhodecode/templates/admin/defaults/defaults.html:65 +#: rhodecode/templates/admin/repos/repo_edit.html:103 +msgid "Enable downloads" +msgstr "Włącz pobieranie" + +#: rhodecode/templates/admin/defaults/defaults.html:69 +#: rhodecode/templates/admin/repos/repo_edit.html:107 +msgid "Enable download menu on summary page." +msgstr "Włącz menu pobierania na stronie podsumowania." + +#: 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 "Włącz blokowanie" + +#: rhodecode/templates/admin/defaults/defaults.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "Włącz blokowanie pobierania w repozytorium." + +#: 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 "Zapisz" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "Administracja LDAP" @@ -1748,18 +1839,6 @@ msgid "E-mail Attribute" msgstr "Atrybut E-maila" -#: 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 "Zapisz" - #: rhodecode/templates/admin/notifications/notifications.html:5 #: rhodecode/templates/admin/notifications/notifications.html:9 msgid "My Notifications" @@ -1774,8 +1853,8 @@ msgstr "Komentarze" #: 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 "Połączone gałęzie" @@ -1817,10 +1896,6 @@ msgid "Anonymous access" msgstr "Dostęp anonimowy" -#: rhodecode/templates/admin/permissions/permissions.html:41 -msgid "Repository permission" -msgstr "Uprawnienia repozytorium" - #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" "All default permissions on each repository will be reset to choosen " @@ -1832,22 +1907,42 @@ "niestandardowe uprawnienia w repozytoriach zostaną utracone." #: rhodecode/templates/admin/permissions/permissions.html:50 +#: rhodecode/templates/admin/permissions/permissions.html:63 msgid "overwrite existing settings" msgstr "Nadpisz ustawienia" #: 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 "Repozytorium grupy" + +#: 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 "" +"Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. " +"Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie " +"niestandardowe uprawnienia w repozytoriach zostaną utracone." + +#: rhodecode/templates/admin/permissions/permissions.html:69 msgid "Registration" msgstr "Rejestracja" -#: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Repository creation" msgstr "Tworzenie repozytorium" -#: rhodecode/templates/admin/permissions/permissions.html:71 +#: rhodecode/templates/admin/permissions/permissions.html:85 msgid "Repository forking" msgstr "Rozwidlanie repozytorium" -#: 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 "ustaw" @@ -1879,24 +1974,11 @@ msgid "Optional http[s] url from which repository should be cloned." msgstr "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane." -#: 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 "Repozytorium grupy" - #: 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 "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." -#: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 -msgid "Type" -msgstr "Typ" - #: rhodecode/templates/admin/repos/repo_add_base.html:42 msgid "Type of repository to create." msgstr "Rodzaj repozytorium do stworzenia." @@ -1922,17 +2004,6 @@ msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." -#: rhodecode/templates/admin/repos/repo_add_base.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 "" -"Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych " -"jako współpracownicy." - #: rhodecode/templates/admin/repos/repo_add_base.html:73 msgid "add" msgstr "dodaj" @@ -1968,31 +2039,6 @@ msgid "Optional select a group to put this repository into." msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." -#: rhodecode/templates/admin/repos/repo_edit.html:94 -msgid "Enable statistics" -msgstr "Włącz statystyki" - -#: rhodecode/templates/admin/repos/repo_edit.html:98 -msgid "Enable statistics window on summary page." -msgstr "Włącz okno statystyk na stronie podsumowania." - -#: rhodecode/templates/admin/repos/repo_edit.html:103 -msgid "Enable downloads" -msgstr "Włącz pobieranie" - -#: rhodecode/templates/admin/repos/repo_edit.html:107 -msgid "Enable download menu on summary page." -msgstr "Włącz menu pobierania na stronie podsumowania." - -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 -msgid "Enable locking" -msgstr "Włącz blokowanie" - -#: rhodecode/templates/admin/repos/repo_edit.html:116 -msgid "Enable lock-by-pulling on repository." -msgstr "Włącz blokowanie pobierania w repozytorium." - #: rhodecode/templates/admin/repos/repo_edit.html:126 msgid "Change owner of this repository." msgstr "Zmiana właściciela tego repozytorium." @@ -2092,9 +2138,9 @@ msgstr "Aktywny" #: 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 "Dziennik publiczny" @@ -2255,9 +2301,9 @@ #: 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 @@ -2938,9 +2984,9 @@ msgstr "Odebrana poczta" #: 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 @@ -3045,22 +3091,27 @@ msgstr "uprawnienia" #: rhodecode/templates/base/base.html:239 +#, fuzzy +msgid "defaults" +msgstr "domyślne" + +#: rhodecode/templates/base/base.html:240 msgid "settings" msgstr "ustawienia" -#: 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 "Obserwowane" -#: 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 "Gałęzie" -#: 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 "Szukaj" @@ -3468,11 +3519,83 @@ msgid "Confirm to delete this user: %s" msgstr "Potwierdź usunięcie tego użytkownika: %s" +#: rhodecode/templates/email_templates/changeset_comment.html:10 +#, fuzzy +msgid "New status$" +msgstr "zmień status" + #: rhodecode/templates/email_templates/main.html:8 #, fuzzy msgid "This is a notification from RhodeCode." msgstr "To jest powiadomienie z strony" +#: 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 +#, fuzzy +msgid "title" +msgstr "Tytuł" + +#: rhodecode/templates/email_templates/pull_request.html:6 +#: rhodecode/templates/pullrequests/pullrequest.html:115 +msgid "description" +msgstr "opis" + +#: rhodecode/templates/email_templates/pull_request.html:11 +msgid "revisions for reviewing" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:18 +#, fuzzy +msgid "View this pull request here" +msgstr "Pokarz wszystkie zmiany" + +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "User %s commented on pull request #%s for repository %s" +msgstr "" +"Użytkownik %s skomentował wniosek o połączenie gałęzi #%s dla " +"repozytorium %s" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +msgid "New status" +msgstr "zmień status" + +#: rhodecode/templates/email_templates/pull_request_comment.html:14 +msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/registration.html:4 +#, fuzzy +msgid "A new user have registered in RhodeCode" +msgstr "Udało Ci się zarejestrować na stronie" + +#: 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" @@ -3572,7 +3695,7 @@ msgstr "lista szukanych plików" #: 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 "dodaj nowy plik" @@ -3640,7 +3763,12 @@ msgid "show at revision" msgstr "wskaż zmiany" -#: rhodecode/templates/files/files_history_box.html:15 +#: rhodecode/templates/files/files_history_box.html:11 +#, fuzzy +msgid "show full history" +msgstr "Wczytywanie listy plików..." + +#: rhodecode/templates/files/files_history_box.html:16 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -3838,10 +3966,6 @@ msgid "Title" msgstr "Tytuł" -#: rhodecode/templates/pullrequests/pullrequest.html:115 -msgid "description" -msgstr "opis" - #: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "Wyślij prośbę o połączenie gałęzi" @@ -3957,7 +4081,8 @@ msgid "%s Shortlog" msgstr "%s Lista zmian" -#: rhodecode/templates/shortlog/shortlog.html:14 +#: rhodecode/templates/shortlog/shortlog.html:15 +#: rhodecode/templates/shortlog/shortlog.html:19 msgid "shortlog" msgstr "lista zmian" @@ -3973,19 +4098,15 @@ msgid "author" msgstr "autor" -#: rhodecode/templates/shortlog/shortlog_data.html:33 -msgid "No commit message" -msgstr "Brak komunikatów" - -#: rhodecode/templates/shortlog/shortlog_data.html:77 +#: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" -#: rhodecode/templates/shortlog/shortlog_data.html:86 +#: rhodecode/templates/shortlog/shortlog_data.html:84 msgid "Push new repo" msgstr "Wyślij zmiany do nowego repo" -#: rhodecode/templates/shortlog/shortlog_data.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:92 msgid "Existing repository?" msgstr "Istniejące repozytorium?"
--- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Mon Dec 03 02:59:13 2012 +0100 +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Mon Dec 03 03:04:07 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\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: 2012-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann <augusto.herrmann@gmail.com>\n" "Language-Team: pt_BR <LL@li.org>\n" @@ -48,6 +48,7 @@ #: rhodecode/controllers/compare.py:75 #: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/shortlog.py:100 #, fuzzy msgid "There are no changesets yet" msgstr "Ainda não há alteações" @@ -186,7 +187,7 @@ msgid "Tags" msgstr "Etiquetas" -#: 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 " @@ -285,19 +286,19 @@ msgstr "Ocorreu um erro durante essa operação de busca" #: 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 "Repositório %s atualizado com sucesso" #: 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 "ocorreu um erro ao atualizar o repositório %s" #: 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 " @@ -309,14 +310,14 @@ "outra vez para varrer novamente por repositórios" #: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:315 +#: rhodecode/controllers/admin/repos.py:316 #, python-format msgid "deleted repository %s" msgstr "excluído o repositório %s" #: 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 "Ocorreu um erro durante a exclusão de %s" @@ -337,7 +338,7 @@ msgstr "bifurcado repositório %s como %s" #: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:423 +#: rhodecode/controllers/admin/repos.py:424 #, fuzzy msgid "An error occurred during unlocking" msgstr "Ocorreu um erro durante essa operação" @@ -351,6 +352,16 @@ msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" +#: rhodecode/controllers/admin/defaults.py:96 +#, fuzzy +msgid "Default settings updated successfully" +msgstr "Configurações de LDAP atualizadas com sucesso" + +#: rhodecode/controllers/admin/defaults.py:110 +#, fuzzy +msgid "error occurred during update of defaults" +msgstr "ocorreu um erro ao atualizar o usuário %s" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "BASE" @@ -408,18 +419,23 @@ msgstr "ocorreu um erro ao atualizar as configurações de LDAP" #: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 msgid "None" msgstr "Nenhum" #: rhodecode/controllers/admin/permissions.py:60 +#: rhodecode/controllers/admin/permissions.py:64 msgid "Read" msgstr "Ler" #: rhodecode/controllers/admin/permissions.py:61 +#: rhodecode/controllers/admin/permissions.py:65 msgid "Write" msgstr "Gravar" #: 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 @@ -438,112 +454,112 @@ #: 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 "Administrador" -#: rhodecode/controllers/admin/permissions.py:65 +#: rhodecode/controllers/admin/permissions.py:69 msgid "disabled" msgstr "desabilitado" -#: rhodecode/controllers/admin/permissions.py:67 -msgid "allowed with manual account activation" -msgstr "permitido com ativação manual de conta" - -#: rhodecode/controllers/admin/permissions.py:69 -msgid "allowed with automatic account activation" -msgstr "permitido com ativação automática de conta" - #: rhodecode/controllers/admin/permissions.py:71 -#: rhodecode/controllers/admin/permissions.py:74 +msgid "allowed with manual account activation" +msgstr "permitido com ativação manual de conta" + +#: rhodecode/controllers/admin/permissions.py:73 +msgid "allowed with automatic account activation" +msgstr "permitido com ativação automática de conta" + +#: rhodecode/controllers/admin/permissions.py:75 +#: rhodecode/controllers/admin/permissions.py:78 msgid "Disabled" msgstr "Desabilitado" -#: 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 "Habilitado" -#: rhodecode/controllers/admin/permissions.py:116 +#: rhodecode/controllers/admin/permissions.py:122 msgid "Default permissions updated successfully" msgstr "Permissões padrões atualizadas com sucesso" -#: rhodecode/controllers/admin/permissions.py:130 +#: rhodecode/controllers/admin/permissions.py:136 msgid "error occurred during update of permissions" msgstr "ocorreu um erro ao atualizar as permissões" -#: rhodecode/controllers/admin/repos.py:124 +#: rhodecode/controllers/admin/repos.py:125 msgid "--REMOVE FORK--" msgstr "--REMOVER BIFURCAÇÂO--" -#: rhodecode/controllers/admin/repos.py:193 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s from %s" msgstr "repositório %s criado a partir de %s" -#: rhodecode/controllers/admin/repos.py:197 +#: rhodecode/controllers/admin/repos.py:198 #, python-format msgid "created repository %s" msgstr "repositório %s criado" -#: rhodecode/controllers/admin/repos.py:228 +#: rhodecode/controllers/admin/repos.py:229 #, python-format msgid "error occurred during creation of repository %s" msgstr "ocorreu um erro ao criar o repositório %s" -#: rhodecode/controllers/admin/repos.py:320 +#: rhodecode/controllers/admin/repos.py:321 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" -#: rhodecode/controllers/admin/repos.py:349 +#: rhodecode/controllers/admin/repos.py:350 msgid "An error occurred during deletion of repository user" msgstr "Ocorreu um erro ao excluir usuário de repositório" -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:369 msgid "An error occurred during deletion of repository users groups" msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório" -#: rhodecode/controllers/admin/repos.py:386 +#: rhodecode/controllers/admin/repos.py:387 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" -#: rhodecode/controllers/admin/repos.py:403 +#: rhodecode/controllers/admin/repos.py:404 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: rhodecode/controllers/admin/repos.py:443 +#: rhodecode/controllers/admin/repos.py:444 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:448 msgid "An error occurred during setting this repository in public journal" msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" -#: rhodecode/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 "Descompasso de Token" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:466 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:468 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: rhodecode/controllers/admin/repos.py:483 +#: rhodecode/controllers/admin/repos.py:484 msgid "Nothing" msgstr "Nada" -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:486 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:490 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" @@ -1018,6 +1034,101 @@ msgid "password reset link" msgstr "link de reinicialização de senha" +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#, fuzzy +msgid "Repository no access" +msgstr "repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#, fuzzy +msgid "Repository read access" +msgstr "Esse repositório já existe" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#, fuzzy +msgid "Repository write access" +msgstr "repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#, fuzzy +msgid "Repository admin access" +msgstr "repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#, fuzzy +msgid "Repositories Group no access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#, fuzzy +msgid "Repositories Group read access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#, fuzzy +msgid "Repositories Group write access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#, fuzzy +msgid "Repositories Group admin access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#, fuzzy +msgid "RhodeCode Administrator" +msgstr "Administração de usuários" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#, fuzzy +msgid "Repository creation disabled" +msgstr "Criação de repositório" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#, fuzzy +msgid "Repository creation enabled" +msgstr "Criação de repositório" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#, fuzzy +msgid "Repository forking disabled" +msgstr "Criação de repositório" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#, fuzzy +msgid "Repository forking enabled" +msgstr "Criação de repositório" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#, fuzzy +msgid "Register disabled" +msgstr "desabilitado" + +#: 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 +#, fuzzy +msgid "Approved" +msgstr "removidos" + +#: 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" @@ -1027,101 +1138,6 @@ msgid "[Mention]" msgstr "[Menção]" -#: rhodecode/model/db.py:1163 -#, fuzzy -msgid "Repository no access" -msgstr "repositórios" - -#: rhodecode/model/db.py:1164 -#, fuzzy -msgid "Repository read access" -msgstr "Esse repositório já existe" - -#: rhodecode/model/db.py:1165 -#, fuzzy -msgid "Repository write access" -msgstr "repositórios" - -#: rhodecode/model/db.py:1166 -#, fuzzy -msgid "Repository admin access" -msgstr "repositórios" - -#: rhodecode/model/db.py:1168 -#, fuzzy -msgid "Repositories Group no access" -msgstr "grupos de repositórios" - -#: rhodecode/model/db.py:1169 -#, fuzzy -msgid "Repositories Group read access" -msgstr "grupos de repositórios" - -#: rhodecode/model/db.py:1170 -#, fuzzy -msgid "Repositories Group write access" -msgstr "grupos de repositórios" - -#: rhodecode/model/db.py:1171 -#, fuzzy -msgid "Repositories Group admin access" -msgstr "grupos de repositórios" - -#: rhodecode/model/db.py:1173 -#, fuzzy -msgid "RhodeCode Administrator" -msgstr "Administração de usuários" - -#: rhodecode/model/db.py:1174 -#, fuzzy -msgid "Repository creation disabled" -msgstr "Criação de repositório" - -#: rhodecode/model/db.py:1175 -#, fuzzy -msgid "Repository creation enabled" -msgstr "Criação de repositório" - -#: rhodecode/model/db.py:1176 -#, fuzzy -msgid "Repository forking disabled" -msgstr "Criação de repositório" - -#: rhodecode/model/db.py:1177 -#, fuzzy -msgid "Repository forking enabled" -msgstr "Criação de repositório" - -#: rhodecode/model/db.py:1178 -#, fuzzy -msgid "Register disabled" -msgstr "desabilitado" - -#: 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 -#, fuzzy -msgid "Approved" -msgstr "removidos" - -#: 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 "Por favor entre um login" @@ -1643,6 +1659,7 @@ msgstr "Sua conta precisa esperar ativação por um administrador" #: 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 @@ -1699,6 +1716,7 @@ msgstr "Ação" #: rhodecode/templates/admin/admin_log.html:7 +#: rhodecode/templates/admin/permissions/permissions.html:41 msgid "Repository" msgstr "Repositório" @@ -1720,6 +1738,80 @@ msgid "No actions yet" msgstr "Ainda não há ações" +#: rhodecode/templates/admin/defaults/defaults.html:5 +#: rhodecode/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repositories defaults" +msgstr "grupos de repositórios" + +#: rhodecode/templates/admin/defaults/defaults.html:11 +#, fuzzy +msgid "Defaults" +msgstr "excluir" + +#: 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 "Tipo" + +#: 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 "" +"Repositórios privados são visíveis somente por pessoas explicitamente " +"adicionadas como colaboradores." + +#: rhodecode/templates/admin/defaults/defaults.html:55 +#: rhodecode/templates/admin/repos/repo_edit.html:94 +msgid "Enable statistics" +msgstr "Habilitar estatísticas" + +#: rhodecode/templates/admin/defaults/defaults.html:59 +#: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable statistics window on summary page." +msgstr "Habilitar janela de estatísticas na página de sumário." + +#: rhodecode/templates/admin/defaults/defaults.html:65 +#: rhodecode/templates/admin/repos/repo_edit.html:103 +msgid "Enable downloads" +msgstr "Habilitar downloads" + +#: rhodecode/templates/admin/defaults/defaults.html:69 +#: rhodecode/templates/admin/repos/repo_edit.html:107 +msgid "Enable download menu on summary page." +msgstr "Habilitar menu de descarregar na página de sumário." + +#: 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 +#, fuzzy +msgid "Enable locking" +msgstr "habilitar" + +#: 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 "Salvar" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "Administração de LDAP" @@ -1792,18 +1884,6 @@ msgid "E-mail Attribute" msgstr "Atributo de E-mail" -#: 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 "Salvar" - #: rhodecode/templates/admin/notifications/notifications.html:5 #: rhodecode/templates/admin/notifications/notifications.html:9 msgid "My Notifications" @@ -1819,8 +1899,8 @@ msgstr "commits" #: 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 "" @@ -1862,10 +1942,6 @@ msgid "Anonymous access" msgstr "Acesso anônimo" -#: rhodecode/templates/admin/permissions/permissions.html:41 -msgid "Repository permission" -msgstr "Permissão de repositório" - #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" "All default permissions on each repository will be reset to choosen " @@ -1877,23 +1953,44 @@ "customizadas nos repositórios serão perdidas" #: rhodecode/templates/admin/permissions/permissions.html:50 +#: rhodecode/templates/admin/permissions/permissions.html:63 msgid "overwrite existing settings" msgstr "sobrescrever configurações existentes" #: 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 "Grupo de repositórios" + +#: rhodecode/templates/admin/permissions/permissions.html:62 +#, fuzzy +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 "" +"Todas as permissões padrão em cada repositório serão reinicializadas para" +" as permissões escolhidas. Note que todas as permissões padrão " +"customizadas nos repositórios serão perdidas" + +#: rhodecode/templates/admin/permissions/permissions.html:69 msgid "Registration" msgstr "Registro" -#: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Repository creation" msgstr "Criação de repositório" -#: rhodecode/templates/admin/permissions/permissions.html:71 +#: rhodecode/templates/admin/permissions/permissions.html:85 #, fuzzy msgid "Repository forking" msgstr "Criação de repositório" -#: 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 "ajustar" @@ -1925,25 +2022,12 @@ msgid "Optional http[s] url from which repository should be cloned." msgstr "URL opcional http[s] da qual o repositório deve ser clonado." -#: 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 "Grupo de repositórios" - #: rhodecode/templates/admin/repos/repo_add_base.html:33 #: rhodecode/templates/forks/fork.html:54 #, fuzzy msgid "Optionaly select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." -#: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 -msgid "Type" -msgstr "Tipo" - #: rhodecode/templates/admin/repos/repo_add_base.html:42 msgid "Type of repository to create." msgstr "Tipo de repositório a criar." @@ -1972,17 +2056,6 @@ "Seja sucinto e objetivo. Use um arquivo README para descrições mais " "longas." -#: 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 "" -"Repositórios privados são visíveis somente por pessoas explicitamente " -"adicionadas como colaboradores." - #: rhodecode/templates/admin/repos/repo_add_base.html:73 msgid "add" msgstr "adicionar" @@ -2018,32 +2091,6 @@ msgid "Optional select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." -#: rhodecode/templates/admin/repos/repo_edit.html:94 -msgid "Enable statistics" -msgstr "Habilitar estatísticas" - -#: rhodecode/templates/admin/repos/repo_edit.html:98 -msgid "Enable statistics window on summary page." -msgstr "Habilitar janela de estatísticas na página de sumário." - -#: rhodecode/templates/admin/repos/repo_edit.html:103 -msgid "Enable downloads" -msgstr "Habilitar downloads" - -#: rhodecode/templates/admin/repos/repo_edit.html:107 -msgid "Enable download menu on summary page." -msgstr "Habilitar menu de descarregar na página de sumário." - -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 -#, fuzzy -msgid "Enable locking" -msgstr "habilitar" - -#: 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 "Mudar o dono desse repositório." @@ -2141,9 +2188,9 @@ msgstr "Ativo" #: 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 "Diário público" @@ -2309,9 +2356,9 @@ #: 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 @@ -3000,9 +3047,9 @@ msgstr "Caixa de Entrada" #: 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 @@ -3110,22 +3157,27 @@ msgstr "permissões" #: rhodecode/templates/base/base.html:239 +#, fuzzy +msgid "defaults" +msgstr "excluir" + +#: rhodecode/templates/base/base.html:240 msgid "settings" msgstr "configurações" -#: 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 "Seguidores" -#: 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 "Bifurcações" -#: 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 "Pesquisar" @@ -3534,11 +3586,82 @@ msgid "Confirm to delete this user: %s" msgstr "Confirma excluir este usuário: %s" +#: rhodecode/templates/email_templates/changeset_comment.html:10 +#, fuzzy +msgid "New status$" +msgstr "Conjuntos de mudanças" + #: rhodecode/templates/email_templates/main.html:8 #, fuzzy msgid "This is a notification from RhodeCode." msgstr "Esta é uma notificação do RhodeCode." +#: 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 +#, fuzzy +msgid "title" +msgstr "escrever" + +#: rhodecode/templates/email_templates/pull_request.html:6 +#: rhodecode/templates/pullrequests/pullrequest.html:115 +#, fuzzy +msgid "description" +msgstr "Descrição" + +#: rhodecode/templates/email_templates/pull_request.html:11 +msgid "revisions for reviewing" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:18 +#, fuzzy +msgid "View this pull request here" +msgstr "Confirma excluir este repositório" + +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "User %s commented on pull request #%s for repository %s" +msgstr "repositório [criado]" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +msgid "New status" +msgstr "Conjuntos de mudanças" + +#: rhodecode/templates/email_templates/pull_request_comment.html:14 +msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/registration.html:4 +#, fuzzy +msgid "A new user have registered in RhodeCode" +msgstr "Você se registrou com sucesso no rhodecode" + +#: 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" @@ -3638,7 +3761,7 @@ msgstr "pesquisar lista de arquivos" #: 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 "adicionar novo arquivo" @@ -3708,7 +3831,12 @@ msgid "show at revision" msgstr "próxima revisão" -#: rhodecode/templates/files/files_history_box.html:15 +#: rhodecode/templates/files/files_history_box.html:11 +#, fuzzy +msgid "show full history" +msgstr "Carregando lista de arquivos..." + +#: rhodecode/templates/files/files_history_box.html:16 #, fuzzy, python-format msgid "%s author" msgid_plural "%s authors" @@ -3915,11 +4043,6 @@ msgid "Title" msgstr "escrever" -#: rhodecode/templates/pullrequests/pullrequest.html:115 -#, fuzzy -msgid "description" -msgstr "Descrição" - #: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" @@ -4040,7 +4163,8 @@ msgid "%s Shortlog" msgstr "log resumido" -#: rhodecode/templates/shortlog/shortlog.html:14 +#: rhodecode/templates/shortlog/shortlog.html:15 +#: rhodecode/templates/shortlog/shortlog.html:19 msgid "shortlog" msgstr "log resumido" @@ -4056,19 +4180,15 @@ msgid "author" msgstr "autor" -#: rhodecode/templates/shortlog/shortlog_data.html:33 -msgid "No commit message" -msgstr "Nenhuma mensagem de commit" - -#: rhodecode/templates/shortlog/shortlog_data.html:77 +#: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" msgstr "Adicionar ou enviar arquivos diretamente pelo RhodeCode" -#: rhodecode/templates/shortlog/shortlog_data.html:86 +#: rhodecode/templates/shortlog/shortlog_data.html:84 msgid "Push new repo" msgstr "Fazer push de novo repositório" -#: rhodecode/templates/shortlog/shortlog_data.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:92 msgid "Existing repository?" msgstr "Repositório existente?"
--- a/rhodecode/i18n/rhodecode.pot Mon Dec 03 02:59:13 2012 +0100 +++ b/rhodecode/i18n/rhodecode.pot Mon Dec 03 03:04:07 2012 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.5.0b\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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -46,6 +46,7 @@ msgstr "" #: rhodecode/controllers/compare.py:75 rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "" @@ -177,7 +178,7 @@ 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 the " @@ -258,30 +259,30 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:108 rhodecode/controllers/admin/repos.py:267 +#: rhodecode/controllers/settings.py:108 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/settings.py:126 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/settings.py:144 rhodecode/controllers/admin/repos.py:304 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from the " "filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/controllers/settings.py:156 rhodecode/controllers/admin/repos.py:315 +#: rhodecode/controllers/settings.py:156 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/settings.py:160 rhodecode/controllers/admin/repos.py:326 +#: rhodecode/controllers/admin/repos.py:332 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -299,7 +300,7 @@ msgid "Repository has been %s" msgstr "" -#: rhodecode/controllers/settings.py:188 rhodecode/controllers/admin/repos.py:423 +#: rhodecode/controllers/settings.py:188 rhodecode/controllers/admin/repos.py:424 msgid "An error occurred during unlocking" msgstr "" @@ -312,6 +313,14 @@ 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 "" @@ -369,18 +378,23 @@ 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 @@ -398,111 +412,111 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: 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:197 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 "" @@ -954,6 +968,86 @@ 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" @@ -963,86 +1057,6 @@ 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 "" @@ -1529,6 +1543,7 @@ 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 @@ -1584,6 +1599,7 @@ msgstr "" #: rhodecode/templates/admin/admin_log.html:7 +#: rhodecode/templates/admin/permissions/permissions.html:41 msgid "Repository" msgstr "" @@ -1604,6 +1620,75 @@ 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 "" @@ -1676,18 +1761,6 @@ 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" @@ -1702,7 +1775,7 @@ 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 "" @@ -1744,10 +1817,6 @@ 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 " @@ -1756,22 +1825,39 @@ 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 "" @@ -1803,24 +1889,11 @@ 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 "" @@ -1846,15 +1919,6 @@ 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 "" @@ -1890,31 +1954,6 @@ 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 "" @@ -2011,8 +2050,8 @@ 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 "" @@ -2164,8 +2203,8 @@ 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:122 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 @@ -2823,8 +2862,8 @@ 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:123 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 @@ -2923,19 +2962,23 @@ 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/search/search.html:52 +#: 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 "" @@ -3329,10 +3372,73 @@ 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" @@ -3431,7 +3537,7 @@ 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 "" @@ -3499,7 +3605,11 @@ 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 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -3695,10 +3805,6 @@ msgid "Title" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:115 -msgid "description" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" @@ -3813,7 +3919,8 @@ 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 "" @@ -3829,19 +3936,15 @@ 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 ""
--- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Mon Dec 03 02:59:13 2012 +0100 +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Mon Dec 03 03:04:07 2012 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.4.4\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: 2012-11-26 15:19+0800\n" "Last-Translator: xpol <xpolife@gmail.com>\n" "Language-Team: mikespook\n" @@ -49,6 +49,7 @@ #: rhodecode/controllers/compare.py:75 #: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "还没有修订集" @@ -180,7 +181,7 @@ 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 " @@ -266,19 +267,19 @@ 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 "版本库%s成功更新" #: 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 "在更新版本库%s的时候发生错误" #: 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 " @@ -287,14 +288,14 @@ msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" #: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:315 +#: rhodecode/controllers/admin/repos.py:316 #, python-format msgid "deleted repository %s" msgstr "已经删除版本库%s" #: 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 "在删除%s的时候发生错误" @@ -313,7 +314,7 @@ msgstr "版本库已被%s" #: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:423 +#: rhodecode/controllers/admin/repos.py:424 msgid "An error occurred during unlocking" msgstr "解锁时发生错误" @@ -326,6 +327,16 @@ msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" +#: rhodecode/controllers/admin/defaults.py:96 +#, fuzzy +msgid "Default settings updated successfully" +msgstr "LDAP设置已经成功更新" + +#: rhodecode/controllers/admin/defaults.py:110 +#, fuzzy +msgid "error occurred during update of defaults" +msgstr "更新用户%s时发生错误" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "BASE" @@ -383,18 +394,23 @@ msgstr "更新LDAP设置时发生错误" #: 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 @@ -413,112 +429,112 @@ #: 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 +#: rhodecode/controllers/admin/permissions.py:69 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" -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 "新版本库%s基于%s建立。" -#: rhodecode/controllers/admin/repos.py:197 +#: rhodecode/controllers/admin/repos.py:198 #, python-format msgid "created repository %s" msgstr "建立版本库%s" -#: rhodecode/controllers/admin/repos.py:228 +#: rhodecode/controllers/admin/repos.py:229 #, python-format msgid "error occurred during creation of repository %s" msgstr "创建版本库时发生错误%s" -#: rhodecode/controllers/admin/repos.py:320 +#: rhodecode/controllers/admin/repos.py:321 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: 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 "成功将版本库%s标记为复刻自%s" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:490 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" @@ -964,6 +980,86 @@ 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 管理员" + +#: 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" @@ -973,86 +1069,6 @@ 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 管理员" - -#: 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 "请登录" @@ -1553,6 +1569,7 @@ 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 @@ -1609,6 +1626,7 @@ msgstr "操作" #: rhodecode/templates/admin/admin_log.html:7 +#: rhodecode/templates/admin/permissions/permissions.html:41 msgid "Repository" msgstr "版本库" @@ -1630,6 +1648,77 @@ msgid "No actions yet" msgstr "无操作" +#: rhodecode/templates/admin/defaults/defaults.html:5 +#: rhodecode/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repositories defaults" +msgstr "版本库组" + +#: rhodecode/templates/admin/defaults/defaults.html:11 +#, fuzzy +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 "LDAP管理员" @@ -1702,18 +1791,6 @@ 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" @@ -1728,8 +1805,8 @@ 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 "拉取请求" @@ -1771,10 +1848,6 @@ 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 " @@ -1783,22 +1856,40 @@ 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 +#, fuzzy +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 "设置" @@ -1830,24 +1921,11 @@ msgid "Optional http[s] url from which repository should be cloned." msgstr "可选的，指定版本库应该从哪个http[s]地址克隆。" -#: 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 "要创建的版本库类型" @@ -1873,15 +1951,6 @@ msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "保持简短。用README文件来写更长的描述。" -#: 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 "新建" @@ -1917,31 +1986,6 @@ 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 "修改这个版本库的所有者" @@ -2038,9 +2082,9 @@ 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 "公共日志" @@ -2195,9 +2239,9 @@ #: 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 @@ -2857,9 +2901,9 @@ 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 @@ -2964,22 +3008,27 @@ msgstr "权限" #: rhodecode/templates/base/base.html:239 +#, fuzzy +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 "搜索" @@ -3370,10 +3419,80 @@ msgid "Confirm to delete this user: %s" msgstr "确认删除用户：%s" +#: rhodecode/templates/email_templates/changeset_comment.html:10 +#, fuzzy +msgid "New status$" +msgstr "改变状态" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is a notification from RhodeCode." msgstr "这是一个RhodeCode通知。" +#: 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 +#, fuzzy +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 +#, fuzzy +msgid "View this pull request here" +msgstr "为这个拉取请求增加检视人员" + +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "User %s commented on pull request #%s for repository %s" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +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 +#, fuzzy +msgid "A new user have registered in RhodeCode" +msgstr "成功注册到RhodeCode" + +#: 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" @@ -3473,7 +3592,7 @@ 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 "新建文件" @@ -3541,7 +3660,12 @@ msgid "show at revision" msgstr "显示修订" -#: rhodecode/templates/files/files_history_box.html:15 +#: rhodecode/templates/files/files_history_box.html:11 +#, fuzzy +msgid "show full history" +msgstr "加载文件历史记录..." + +#: rhodecode/templates/files/files_history_box.html:16 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -3736,10 +3860,6 @@ msgid "Title" msgstr "标题" -#: rhodecode/templates/pullrequests/pullrequest.html:115 -msgid "description" -msgstr "描述" - #: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "发送拉取请求" @@ -3853,7 +3973,8 @@ msgid "%s Shortlog" msgstr "%s简短日志" -#: rhodecode/templates/shortlog/shortlog.html:14 +#: rhodecode/templates/shortlog/shortlog.html:15 +#: rhodecode/templates/shortlog/shortlog.html:19 msgid "shortlog" msgstr "简短日志" @@ -3869,19 +3990,15 @@ 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直接添加或者上传文件" -#: 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 "已有版本库？"
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Mon Dec 03 02:59:13 2012 +0100 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Mon Dec 03 03:04:07 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\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: 2012-05-09 22:23+0800\n" "Last-Translator: Nansen <nansenat16@gmail.com>\n" "Language-Team: zh_TW <LL@li.org>\n" @@ -49,6 +49,7 @@ #: rhodecode/controllers/compare.py:75 #: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/shortlog.py:100 #, fuzzy msgid "There are no changesets yet" msgstr "尚未有任何變更" @@ -185,7 +186,7 @@ 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 " @@ -275,19 +276,19 @@ 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 "版本庫 %s 更新完成" #: 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 " @@ -296,14 +297,14 @@ 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 "刪除版本庫 %s" #: 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 "" @@ -324,7 +325,7 @@ msgstr "forked %s 版本庫為 %s" #: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:423 +#: rhodecode/controllers/admin/repos.py:424 msgid "An error occurred during unlocking" msgstr "" @@ -337,6 +338,15 @@ msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" +#: rhodecode/controllers/admin/defaults.py:96 +#, fuzzy +msgid "Default settings updated successfully" +msgstr "LDAP設定更新完成" + +#: rhodecode/controllers/admin/defaults.py:110 +msgid "error occurred during update of defaults" +msgstr "" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" @@ -394,18 +404,23 @@ 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 @@ -424,112 +439,112 @@ #: 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 +#: rhodecode/controllers/admin/permissions.py:69 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" -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 "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:197 +#: rhodecode/controllers/admin/repos.py:198 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: 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 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:490 msgid "An error occurred during this operation" msgstr "" @@ -988,6 +1003,101 @@ msgid "password reset link" msgstr "您的密碼重設連結已寄出" +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#, fuzzy +msgid "Repository no access" +msgstr "個版本庫" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#, fuzzy +msgid "Repository read access" +msgstr "這個版本庫已經存在" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#, fuzzy +msgid "Repository write access" +msgstr "個版本庫" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#, fuzzy +msgid "Repository admin access" +msgstr "個版本庫" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#, fuzzy +msgid "Repositories Group no access" +msgstr "版本庫群組" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#, fuzzy +msgid "Repositories Group read access" +msgstr "版本庫群組" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#, fuzzy +msgid "Repositories Group write access" +msgstr "版本庫群組" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#, fuzzy +msgid "Repositories Group admin access" +msgstr "版本庫群組" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#, fuzzy +msgid "RhodeCode Administrator" +msgstr "使用者管理員" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#, fuzzy +msgid "Repository creation disabled" +msgstr "版本庫建立" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#, fuzzy +msgid "Repository creation enabled" +msgstr "版本庫建立" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#, fuzzy +msgid "Repository forking disabled" +msgstr "版本庫建立" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#, fuzzy +msgid "Repository forking enabled" +msgstr "版本庫建立" + +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#, fuzzy +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 +#, fuzzy +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" @@ -997,101 +1107,6 @@ msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1163 -#, fuzzy -msgid "Repository no access" -msgstr "個版本庫" - -#: rhodecode/model/db.py:1164 -#, fuzzy -msgid "Repository read access" -msgstr "這個版本庫已經存在" - -#: rhodecode/model/db.py:1165 -#, fuzzy -msgid "Repository write access" -msgstr "個版本庫" - -#: rhodecode/model/db.py:1166 -#, fuzzy -msgid "Repository admin access" -msgstr "個版本庫" - -#: rhodecode/model/db.py:1168 -#, fuzzy -msgid "Repositories Group no access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1169 -#, fuzzy -msgid "Repositories Group read access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1170 -#, fuzzy -msgid "Repositories Group write access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1171 -#, fuzzy -msgid "Repositories Group admin access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1173 -#, fuzzy -msgid "RhodeCode Administrator" -msgstr "使用者管理員" - -#: rhodecode/model/db.py:1174 -#, fuzzy -msgid "Repository creation disabled" -msgstr "版本庫建立" - -#: rhodecode/model/db.py:1175 -#, fuzzy -msgid "Repository creation enabled" -msgstr "版本庫建立" - -#: rhodecode/model/db.py:1176 -#, fuzzy -msgid "Repository forking disabled" -msgstr "版本庫建立" - -#: rhodecode/model/db.py:1177 -#, fuzzy -msgid "Repository forking enabled" -msgstr "版本庫建立" - -#: rhodecode/model/db.py:1178 -#, fuzzy -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 -#, fuzzy -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 "請登入" @@ -1601,6 +1616,7 @@ 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 @@ -1658,6 +1674,7 @@ msgstr "動作" #: rhodecode/templates/admin/admin_log.html:7 +#: rhodecode/templates/admin/permissions/permissions.html:41 msgid "Repository" msgstr "版本庫" @@ -1679,6 +1696,78 @@ msgid "No actions yet" msgstr "" +#: rhodecode/templates/admin/defaults/defaults.html:5 +#: rhodecode/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repositories defaults" +msgstr "版本庫群組" + +#: rhodecode/templates/admin/defaults/defaults.html:11 +#, fuzzy +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 +#, fuzzy +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 "LDAP管理者" @@ -1751,18 +1840,6 @@ 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" @@ -1778,8 +1855,8 @@ 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 "" @@ -1823,10 +1900,6 @@ 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 " @@ -1835,23 +1908,40 @@ 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 #, fuzzy 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 "設定" @@ -1883,24 +1973,11 @@ 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 #, fuzzy msgid "Type of repository to create." @@ -1928,15 +2005,6 @@ 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 "新增" @@ -1972,32 +2040,6 @@ 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 -#, fuzzy -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 #, fuzzy msgid "Change owner of this repository." @@ -2095,9 +2137,9 @@ 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 "公開日誌" @@ -2255,9 +2297,9 @@ #: 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 @@ -2949,9 +2991,9 @@ 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 @@ -3058,22 +3100,27 @@ msgstr "權限" #: rhodecode/templates/base/base.html:239 +#, fuzzy +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 "搜尋" @@ -3478,10 +3525,81 @@ msgid "Confirm to delete this user: %s" msgstr "確認刪除這個使用者" +#: rhodecode/templates/email_templates/changeset_comment.html:10 +#, fuzzy +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 +#, fuzzy +msgid "title" +msgstr "寫" + +#: rhodecode/templates/email_templates/pull_request.html:6 +#: rhodecode/templates/pullrequests/pullrequest.html:115 +#, fuzzy +msgid "description" +msgstr "描述" + +#: rhodecode/templates/email_templates/pull_request.html:11 +msgid "revisions for reviewing" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:18 +#, fuzzy +msgid "View this pull request here" +msgstr "確認移除這個版本庫" + +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "User %s commented on pull request #%s for repository %s" +msgstr "建立使用者 %s" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +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 +#, fuzzy +msgid "A new user have registered in RhodeCode" +msgstr "您已經成功註冊rhodecode" + +#: 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" @@ -3587,7 +3705,7 @@ msgstr "搜尋檔案列表" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:80 +#: rhodecode/templates/shortlog/shortlog_data.html:78 #, fuzzy msgid "add new file" msgstr "新增使用者" @@ -3661,7 +3779,12 @@ msgid "show at revision" msgstr "下一個修訂" -#: rhodecode/templates/files/files_history_box.html:15 +#: rhodecode/templates/files/files_history_box.html:11 +#, fuzzy +msgid "show full history" +msgstr "載入檔案列表..." + +#: rhodecode/templates/files/files_history_box.html:16 #, fuzzy, python-format msgid "%s author" msgid_plural "%s authors" @@ -3870,11 +3993,6 @@ msgid "Title" msgstr "寫" -#: rhodecode/templates/pullrequests/pullrequest.html:115 -#, fuzzy -msgid "description" -msgstr "描述" - #: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" @@ -3994,7 +4112,8 @@ 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 "簡短紀錄" @@ -4010,20 +4129,15 @@ msgid "author" msgstr "作者" -#: rhodecode/templates/shortlog/shortlog_data.html:33 -#, fuzzy -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 #, fuzzy msgid "Existing repository?" msgstr "Git 版本庫"