diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.4.0\n" +"Project-Id-Version: RhodeCode 1.4.0b\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-07-02 11:58+0200\n" +"POT-Creation-Date: 2012-07-08 15:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -79,76 +79,76 @@ msgstr "" msgid "commited on" msgstr "" -#: rhodecode/controllers/files.py:86 +#: rhodecode/controllers/files.py:84 #: rhodecode/templates/admin/repos/repo_add.html:13 msgid "add new" msgstr "" -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/files.py:85 #, python-format msgid "There are no files yet %s" msgstr "" -#: rhodecode/controllers/files.py:256 +#: rhodecode/controllers/files.py:254 #, python-format msgid "Edited %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:261 +#: rhodecode/controllers/files.py:259 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:272 rhodecode/controllers/files.py:326 +#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:277 rhodecode/controllers/files.py:332 +#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:298 +#: rhodecode/controllers/files.py:296 #, python-format msgid "Added %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:312 +#: rhodecode/controllers/files.py:310 msgid "No content" msgstr "" -#: rhodecode/controllers/files.py:316 +#: rhodecode/controllers/files.py:314 msgid "No filename" msgstr "" -#: rhodecode/controllers/files.py:358 +#: rhodecode/controllers/files.py:356 msgid "downloads disabled" msgstr "" +#: rhodecode/controllers/files.py:367 +#, python-format +msgid "Unknown revision %s" +msgstr "" + #: rhodecode/controllers/files.py:369 -#, python-format -msgid "Unknown revision %s" +msgid "Empty repository" msgstr "" #: rhodecode/controllers/files.py:371 -msgid "Empty repository" -msgstr "" - -#: rhodecode/controllers/files.py:373 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:474 +#: rhodecode/controllers/files.py:472 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:475 rhodecode/controllers/pullrequests.py:65 +#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:66 #: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:476 rhodecode/controllers/pullrequests.py:69 +#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:70 #: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 msgid "Tags" msgstr "" @@ -182,7 +182,7 @@ msgid "public journal" msgstr "" #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:217 +#: rhodecode/templates/base/base.html:218 msgid "journal" msgstr "" @@ -198,20 +198,20 @@ msgstr "" msgid "Your password reset was successful, new password has been sent to your email" msgstr "" -#: rhodecode/controllers/pullrequests.py:67 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:136 #, python-format msgid "%s (owner)" msgstr "" -#: rhodecode/controllers/pullrequests.py:142 +#: rhodecode/controllers/pullrequests.py:161 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:145 +#: rhodecode/controllers/pullrequests.py:164 msgid "Error occurred during sending pull request" msgstr "" @@ -350,8 +350,8 @@ msgstr "" #: 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:334 -#: rhodecode/templates/base/base.html:336 rhodecode/templates/base/base.html:338 +#: rhodecode/templates/base/base.html:197 rhodecode/templates/base/base.html:335 +#: rhodecode/templates/base/base.html:337 rhodecode/templates/base/base.html:339 msgid "Admin" msgstr "" @@ -476,7 +476,7 @@ msgstr "" msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:198 +#: rhodecode/controllers/admin/repos_groups.py:197 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" @@ -546,12 +546,12 @@ msgstr "" msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:368 +#: rhodecode/controllers/admin/settings.py:367 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:388 -#: rhodecode/controllers/admin/users.py:142 +#: rhodecode/controllers/admin/settings.py:387 +#: rhodecode/controllers/admin/users.py:143 #, python-format msgid "error occurred during update of user %s" msgstr "" @@ -833,84 +833,84 @@ msgstr "" msgid "password reset link" msgstr "" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:110 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:146 +#: rhodecode/model/comment.py:157 msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1062 -msgid "Repository no access" -msgstr "" - -#: rhodecode/model/db.py:1063 -msgid "Repository read access" -msgstr "" - -#: rhodecode/model/db.py:1064 -msgid "Repository write access" -msgstr "" - -#: rhodecode/model/db.py:1065 -msgid "Repository admin access" -msgstr "" - -#: rhodecode/model/db.py:1067 -msgid "Repositories Group no access" -msgstr "" - -#: rhodecode/model/db.py:1068 -msgid "Repositories Group read access" -msgstr "" - -#: rhodecode/model/db.py:1069 -msgid "Repositories Group write access" -msgstr "" - -#: rhodecode/model/db.py:1070 -msgid "Repositories Group admin access" -msgstr "" - #: rhodecode/model/db.py:1072 -msgid "RhodeCode Administrator" +msgid "Repository no access" msgstr "" #: rhodecode/model/db.py:1073 -msgid "Repository creation disabled" +msgid "Repository read access" msgstr "" #: rhodecode/model/db.py:1074 -msgid "Repository creation enabled" +msgid "Repository write access" msgstr "" #: rhodecode/model/db.py:1075 -msgid "Register disabled" -msgstr "" - -#: rhodecode/model/db.py:1076 -msgid "Register new user with RhodeCode with manual activation" +msgid "Repository admin access" +msgstr "" + +#: rhodecode/model/db.py:1077 +msgid "Repositories Group no access" +msgstr "" + +#: rhodecode/model/db.py:1078 +msgid "Repositories Group read access" msgstr "" #: rhodecode/model/db.py:1079 +msgid "Repositories Group write access" +msgstr "" + +#: rhodecode/model/db.py:1080 +msgid "Repositories Group admin access" +msgstr "" + +#: rhodecode/model/db.py:1082 +msgid "RhodeCode Administrator" +msgstr "" + +#: rhodecode/model/db.py:1083 +msgid "Repository creation disabled" +msgstr "" + +#: rhodecode/model/db.py:1084 +msgid "Repository creation enabled" +msgstr "" + +#: rhodecode/model/db.py:1085 +msgid "Register disabled" +msgstr "" + +#: rhodecode/model/db.py:1086 +msgid "Register new user with RhodeCode with manual activation" +msgstr "" + +#: rhodecode/model/db.py:1089 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1479 +#: rhodecode/model/db.py:1489 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1480 +#: rhodecode/model/db.py:1490 msgid "Approved" msgstr "" -#: rhodecode/model/db.py:1481 +#: rhodecode/model/db.py:1491 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1482 +#: rhodecode/model/db.py:1492 msgid "Under Review" msgstr "" @@ -956,7 +956,7 @@ msgstr "" msgid "commented on pull request" msgstr "" -#: rhodecode/model/pull_request.py:75 +#: rhodecode/model/pull_request.py:82 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" @@ -965,19 +965,19 @@ msgstr "" msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:238 +#: rhodecode/model/user.py:240 msgid "new user registration" msgstr "" -#: rhodecode/model/user.py:263 rhodecode/model/user.py:284 +#: rhodecode/model/user.py:265 rhodecode/model/user.py:287 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:306 +#: rhodecode/model/user.py:311 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:312 +#: rhodecode/model/user.py:317 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " @@ -1123,7 +1123,7 @@ msgstr "" msgid "quick filter..." msgstr "" -#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:218 +#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:219 msgid "repositories" msgstr "" @@ -1531,6 +1531,7 @@ msgid "E-mail Attribute" msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:132 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_edit.html:129 @@ -1555,7 +1556,7 @@ msgid "Comments" msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:251 rhodecode/templates/base/base.html:253 +#: rhodecode/templates/base/base.html:252 rhodecode/templates/base/base.html:254 msgid "Pull requests" msgstr "" @@ -1750,6 +1751,22 @@ msgstr "" msgid "Change owner of this repository." msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:133 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:245 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/files/files_add.html:82 +#: rhodecode/templates/files/files_edit.html:68 +#: rhodecode/templates/pullrequests/pullrequest.html:135 +#: rhodecode/templates/settings/repo_settings.html:85 +msgid "Reset" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:143 msgid "Administration" msgstr "" @@ -1799,8 +1816,8 @@ msgid "Confirm to invalidate repository msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:186 -#: rhodecode/templates/base/base.html:315 rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 +#: rhodecode/templates/base/base.html:316 rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:320 msgid "Public journal" msgstr "" @@ -1865,7 +1882,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:38 -#: rhodecode/templates/base/base.html:214 +#: rhodecode/templates/base/base.html:215 msgid "admin" msgstr "" @@ -1973,21 +1990,6 @@ msgstr "" msgid "edit repos group" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:177 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:245 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:135 -#: rhodecode/templates/settings/repo_settings.html:85 -msgid "Reset" -msgstr "" - #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "" @@ -2337,7 +2339,7 @@ msgid "active" msgstr "" #: rhodecode/templates/admin/users/users.html:39 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "" @@ -2435,8 +2437,8 @@ msgstr "" msgid "Inbox" msgstr "" -#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:297 -#: rhodecode/templates/base/base.html:299 rhodecode/templates/base/base.html:301 +#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:298 +#: rhodecode/templates/base/base.html:300 rhodecode/templates/base/base.html:302 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2458,8 +2460,8 @@ msgstr "" msgid "Home" msgstr "" -#: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:306 -#: rhodecode/templates/base/base.html:308 rhodecode/templates/base/base.html:310 +#: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:307 +#: rhodecode/templates/base/base.html:309 rhodecode/templates/base/base.html:311 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2518,7 +2520,7 @@ msgid "Options" msgstr "" #: rhodecode/templates/base/base.html:204 rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/base/base.html:225 msgid "settings" msgstr "" @@ -2529,35 +2531,40 @@ msgid "fork" msgstr "" #: rhodecode/templates/base/base.html:210 +#: rhodecode/templates/changelog/changelog.html:39 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/templates/base/base.html:211 msgid "search" msgstr "" -#: rhodecode/templates/base/base.html:219 -msgid "repositories groups" -msgstr "" - #: rhodecode/templates/base/base.html:220 -msgid "users" +msgid "repositories groups" msgstr "" #: rhodecode/templates/base/base.html:221 -msgid "users groups" +msgid "users" msgstr "" #: rhodecode/templates/base/base.html:222 +msgid "users groups" +msgstr "" + +#: rhodecode/templates/base/base.html:223 msgid "permissions" msgstr "" -#: rhodecode/templates/base/base.html:235 rhodecode/templates/base/base.html:237 +#: rhodecode/templates/base/base.html:236 rhodecode/templates/base/base.html:238 msgid "Followers" msgstr "" -#: rhodecode/templates/base/base.html:243 rhodecode/templates/base/base.html:245 +#: rhodecode/templates/base/base.html:244 rhodecode/templates/base/base.html:246 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:324 rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 rhodecode/templates/search/search.html:52 +#: rhodecode/templates/base/base.html:325 rhodecode/templates/base/base.html:327 +#: rhodecode/templates/base/base.html:329 rhodecode/templates/search/search.html:52 msgid "Search" msgstr "" @@ -2654,10 +2661,6 @@ msgstr "" msgid "Compare fork" msgstr "" -#: rhodecode/templates/changelog/changelog.html:39 -msgid "Open new pull request" -msgstr "" - #: rhodecode/templates/changelog/changelog.html:44 msgid "Show" msgstr ""