diff --git a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-07-02 11:58+0200\n" +"POT-Creation-Date: 2012-07-08 15:39+0200\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \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 "" @@ -184,7 +184,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 "" @@ -202,20 +202,20 @@ msgid "" "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 "" @@ -361,9 +361,9 @@ msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:334 -#: rhodecode/templates/base/base.html:336 -#: rhodecode/templates/base/base.html:338 +#: rhodecode/templates/base/base.html:335 +#: rhodecode/templates/base/base.html:337 +#: rhodecode/templates/base/base.html:339 msgid "Admin" msgstr "" @@ -488,7 +488,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 "" @@ -558,12 +558,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 "" @@ -845,84 +845,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 "" @@ -968,7 +968,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 "" @@ -977,19 +977,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 " @@ -1135,7 +1135,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 "" @@ -1556,6 +1556,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 @@ -1576,15 +1577,13 @@ msgid "All" msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:30 -#, fuzzy, python-format -#| msgid "%d comment" -#| msgid_plural "%d comments" +#, fuzzy 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 "" @@ -1779,6 +1778,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 "" @@ -1828,9 +1843,9 @@ 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 "" @@ -1895,7 +1910,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 "" @@ -2003,21 +2018,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 "" @@ -2368,7 +2368,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 "" @@ -2467,9 +2467,9 @@ 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: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 @@ -2493,9 +2493,9 @@ 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: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 @@ -2561,7 +2561,7 @@ 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 "" @@ -2572,38 +2572,43 @@ 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/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 "" @@ -2702,10 +2707,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 "" @@ -3122,16 +3123,12 @@ msgid "diff to revision" msgstr "" #: rhodecode/templates/files/files_source.html:10 -#, fuzzy, python-format -#| msgid "showing %d out of %d revision" -#| msgid_plural "showing %d out of %d revisions" +#, fuzzy msgid "show at revision" msgstr "" #: rhodecode/templates/files/files_source.html:14 #, fuzzy, python-format -#| msgid "%d hour" -#| msgid_plural "%d hours" msgid "%s author" msgid_plural "%s authors" msgstr[0] "" @@ -3571,80 +3568,3 @@ msgstr "" msgid "%s Tags" msgstr "" -#~ msgid "%s public journal %s feed" -#~ msgstr "" - -#~ msgid "Invalid username" -#~ msgstr "" - -#~ msgid "This username already exists" -#~ msgstr "" - -#~ msgid "Invalid group name" -#~ msgstr "" - -#~ msgid "This users group already exists" -#~ msgstr "" - -#~ msgid "" -#~ "RepoGroup name may only contain " -#~ "alphanumeric characters underscores, periods " -#~ "or dashes and must begin with " -#~ "alphanumeric character" -#~ msgstr "" - -#~ msgid "This group already exists" -#~ msgstr "" - -#~ msgid "Repository with this name already exists" -#~ msgstr "" - -#~ msgid "Invalid characters in password" -#~ msgstr "" - -#~ msgid "This username is not valid" -#~ msgstr "" - -#~ msgid "This repository name is disallowed" -#~ msgstr "" - -#~ msgid "This repository already exists in a group \"%s\"" -#~ msgstr "" - -#~ msgid "There is a group with this name already \"%s\"" -#~ msgstr "" - -#~ msgid "This repository already exists" -#~ msgstr "" - -#~ msgid "Fork have to be the same type as original" -#~ msgstr "" - -#~ msgid "This e-mail address doesn't exist." -#~ msgstr "" - -#~ msgid "" -#~ "The LDAP Login attribute of the CN" -#~ " must be specified - this is " -#~ "the name of the attribute that is" -#~ " equivalent to 'username'" -#~ msgstr "" - -#~ msgid "Set as fork" -#~ msgstr "" - -#~ msgid "Manually set this repository as a fork of another" -#~ msgstr "" - -#~ msgid "Edit file" -#~ msgstr "" - -#~ msgid "Started following" -#~ msgstr "" - -#~ msgid "in repository: " -#~ msgstr "" - -#~ msgid "in all repositories" -#~ msgstr "" - diff --git a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.1.5\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: 2012-06-05 20:07+0100\n" "Last-Translator: Vincent Duvert \n" "Language-Team: fr \n" @@ -83,76 +83,76 @@ msgstr "Flux %s de %s" msgid "commited on" msgstr "a commité, le" -#: rhodecode/controllers/files.py:86 +#: rhodecode/controllers/files.py:84 #: rhodecode/templates/admin/repos/repo_add.html:13 msgid "add new" msgstr "ajouter un nouveau" -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/files.py:85 #, python-format msgid "There are no files yet %s" msgstr "Il n’y a pas encore de fichiers %s" -#: rhodecode/controllers/files.py:256 +#: rhodecode/controllers/files.py:254 #, python-format msgid "Edited %s via RhodeCode" msgstr "%s édité via RhodeCode" -#: rhodecode/controllers/files.py:261 +#: rhodecode/controllers/files.py:259 msgid "No changes" msgstr "Aucun changement" -#: 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 "Commit réalisé avec succès sur %s" -#: 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 "Une erreur est survenue durant le commit" -#: rhodecode/controllers/files.py:298 +#: rhodecode/controllers/files.py:296 #, python-format msgid "Added %s via RhodeCode" msgstr "%s ajouté par RhodeCode" -#: rhodecode/controllers/files.py:312 +#: rhodecode/controllers/files.py:310 msgid "No content" msgstr "Aucun contenu" -#: rhodecode/controllers/files.py:316 +#: rhodecode/controllers/files.py:314 msgid "No filename" msgstr "Aucun nom de fichier" -#: rhodecode/controllers/files.py:358 +#: rhodecode/controllers/files.py:356 msgid "downloads disabled" msgstr "Les téléchargements sont désactivés" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:367 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue." -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:369 msgid "Empty repository" msgstr "Dépôt vide." -#: rhodecode/controllers/files.py:373 +#: rhodecode/controllers/files.py:371 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: 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 "Changesets" -#: 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 "Branches" -#: 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 "Tags" @@ -191,12 +191,11 @@ msgstr "Une erreur est survenue durant le fork du dépôt %s." #: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 #, fuzzy -#| msgid "Public journal" msgid "public journal" msgstr "Journal public" #: 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 "Journal" @@ -216,27 +215,23 @@ msgstr "" "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " "été envoyé par e-mail." -#: rhodecode/controllers/pullrequests.py:67 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 #, fuzzy -#| msgid "bookmarks" msgid "Bookmarks" msgstr "Signets" -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:136 #, fuzzy, python-format -#| msgid "%s Followers" msgid "%s (owner)" msgstr "Followers de %s" -#: rhodecode/controllers/pullrequests.py:142 +#: rhodecode/controllers/pullrequests.py:161 #, fuzzy -#| msgid "successfully deleted user" msgid "Successfully opened new pull request" msgstr "L’utilisateur a été supprimé avec succès." -#: rhodecode/controllers/pullrequests.py:145 -#, fuzzy, python-format -#| msgid "error occurred during creation of repository %s" +#: rhodecode/controllers/pullrequests.py:164 +#, fuzzy msgid "Error occurred during sending pull request" msgstr "Une erreur est survenue durant la création du dépôt %s." @@ -387,9 +382,9 @@ msgstr "Écrire" #: 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:335 +#: rhodecode/templates/base/base.html:337 +#: rhodecode/templates/base/base.html:339 msgid "Admin" msgstr "Administration" @@ -518,7 +513,7 @@ msgstr "Le groupe de dépôts %s a été mis à jour." msgid "error occurred during update of repos group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s." -#: 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 "Ce groupe contient %s dépôts et ne peut être supprimé." @@ -594,12 +589,12 @@ msgstr "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application." -#: rhodecode/controllers/admin/settings.py:368 +#: rhodecode/controllers/admin/settings.py:367 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: 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 "Une erreur est survenue durant la mise à jour de l’utilisateur %s." @@ -647,13 +642,11 @@ msgstr "" #: rhodecode/controllers/admin/users.py:241 #, fuzzy -#| msgid "An error occurred during this operation" msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant cette opération." #: rhodecode/controllers/admin/users.py:251 -#, fuzzy, python-format -#| msgid "removed repos group %s" +#, fuzzy msgid "Removed email from user" msgstr "Le groupe de dépôts %s a été supprimé." @@ -792,7 +785,6 @@ msgstr "[a commenté] une révision du dépôt" #: rhodecode/lib/helpers.py:605 #, fuzzy -#| msgid "[commented] on revision in repository" msgid "[commented] on pull request" msgstr "[a commenté] une révision du dépôt" @@ -889,110 +881,97 @@ msgstr "à l’instant" msgid "password reset link" msgstr "Réinitialisation du mot de passe" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:110 #, python-format msgid "on line %s" msgstr "à la ligne %s" -#: rhodecode/model/comment.py:146 +#: rhodecode/model/comment.py:157 msgid "[Mention]" msgstr "[Mention]" -#: rhodecode/model/db.py:1062 -#, fuzzy -#| msgid "repositories" -msgid "Repository no access" -msgstr "Dépôts" - -#: rhodecode/model/db.py:1063 -#, fuzzy -#| msgid "This repository already exists" -msgid "Repository read access" -msgstr "Ce dépôt existe déjà" - -#: rhodecode/model/db.py:1064 -#, fuzzy -#| msgid "repositories" -msgid "Repository write access" -msgstr "Dépôts" - -#: rhodecode/model/db.py:1065 -#, fuzzy -#| msgid "repositories" -msgid "Repository admin access" -msgstr "Dépôts" - -#: rhodecode/model/db.py:1067 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group no access" -msgstr "Groupes de dépôts" - -#: rhodecode/model/db.py:1068 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group read access" -msgstr "Groupes de dépôts" - -#: rhodecode/model/db.py:1069 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group write access" -msgstr "Groupes de dépôts" - -#: rhodecode/model/db.py:1070 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group admin access" -msgstr "Groupes de dépôts" - #: rhodecode/model/db.py:1072 #, fuzzy -#| msgid "Users administration" -msgid "RhodeCode Administrator" -msgstr "Administration des utilisateurs" +msgid "Repository no access" +msgstr "Dépôts" #: rhodecode/model/db.py:1073 #, fuzzy -#| msgid "Repository creation" -msgid "Repository creation disabled" -msgstr "Création de dépôt" +msgid "Repository read access" +msgstr "Ce dépôt existe déjà" #: rhodecode/model/db.py:1074 #, fuzzy -#| msgid "Repository creation" -msgid "Repository creation enabled" -msgstr "Création de dépôt" +msgid "Repository write access" +msgstr "Dépôts" #: rhodecode/model/db.py:1075 #, fuzzy -#| msgid "disabled" +msgid "Repository admin access" +msgstr "Dépôts" + +#: rhodecode/model/db.py:1077 +#, fuzzy +msgid "Repositories Group no access" +msgstr "Groupes de dépôts" + +#: rhodecode/model/db.py:1078 +#, fuzzy +msgid "Repositories Group read access" +msgstr "Groupes de dépôts" + +#: rhodecode/model/db.py:1079 +#, fuzzy +msgid "Repositories Group write access" +msgstr "Groupes de dépôts" + +#: rhodecode/model/db.py:1080 +#, fuzzy +msgid "Repositories Group admin access" +msgstr "Groupes de dépôts" + +#: rhodecode/model/db.py:1082 +#, fuzzy +msgid "RhodeCode Administrator" +msgstr "Administration des utilisateurs" + +#: rhodecode/model/db.py:1083 +#, fuzzy +msgid "Repository creation disabled" +msgstr "Création de dépôt" + +#: rhodecode/model/db.py:1084 +#, fuzzy +msgid "Repository creation enabled" +msgstr "Création de dépôt" + +#: rhodecode/model/db.py:1085 +#, fuzzy msgid "Register disabled" msgstr "Désactivé" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1086 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1079 +#: 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 #, fuzzy -#| msgid "removed" msgid "Approved" msgstr "Supprimés" -#: 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 "" @@ -1036,38 +1015,36 @@ msgstr "" #: rhodecode/model/notification.py:208 #, fuzzy -#| msgid "commented on commit" msgid "commented on pull request" msgstr "a posté un commentaire sur le commit" -#: 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 "" #: rhodecode/model/scm.py:489 #, fuzzy -#| msgid "last login" msgid "latest tip" msgstr "Dernière connexion" -#: rhodecode/model/user.py:238 +#: rhodecode/model/user.py:240 msgid "new user registration" msgstr "Nouveau compte utilisateur enregistré" -#: 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 "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application." -#: 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 "" "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " "bon fonctionnement de l’application." -#: rhodecode/model/user.py:312 +#: rhodecode/model/user.py:317 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1078,7 +1055,6 @@ msgstr "" #: rhodecode/model/validators.py:52 #, fuzzy, python-format -#| msgid "This username already exists" msgid "Username \"%(username)s\" already exists" msgstr "Ce nom d’utilisateur existe déjà" @@ -1098,19 +1074,16 @@ msgstr "" #: rhodecode/model/validators.py:84 #, fuzzy, python-format -#| msgid "This username or users group name is not valid" msgid "Username %(username)s is not valid" msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide." #: rhodecode/model/validators.py:103 #, fuzzy -#| msgid "invalid user name" msgid "Invalid users group name" msgstr "nom d’utilisateur invalide" #: rhodecode/model/validators.py:104 #, fuzzy, python-format -#| msgid "This users group already exists" msgid "Users group \"%(usersgroup)s\" already exists" msgstr "Ce groupe d’utilisateurs existe déjà." @@ -1129,19 +1102,16 @@ msgstr "Impossible d’assigner ce groupe en tant que parent." #: rhodecode/model/validators.py:145 #, fuzzy, python-format -#| msgid "This username already exists" msgid "Group \"%(group_name)s\" already exists" msgstr "Ce nom d’utilisateur existe déjà" #: rhodecode/model/validators.py:147 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Un dépôt portant ce nom existe déjà." #: rhodecode/model/validators.py:205 #, fuzzy -#| msgid "Invalid characters in password" msgid "Invalid characters (non-ascii) in password" msgstr "Caractères incorrects dans le mot de passe" @@ -1163,25 +1133,21 @@ msgstr "Votre compte est désactivé" #: rhodecode/model/validators.py:283 #, fuzzy, python-format -#| msgid "This repository name is disallowed" msgid "Repository name %(repo)s is disallowed" msgstr "Ce nom de dépôt est interdit" #: rhodecode/model/validators.py:285 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repository named %(repo)s already exists" msgstr "Un dépôt portant ce nom existe déjà." #: rhodecode/model/validators.py:286 #, fuzzy, python-format -#| msgid "This repository already exists in a group \"%s\"" msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Ce dépôt existe déjà dans le groupe « %s »." #: rhodecode/model/validators.py:288 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "Un dépôt portant ce nom existe déjà." @@ -1197,7 +1163,6 @@ msgstr "" #: rhodecode/model/validators.py:418 #, fuzzy -#| msgid "Fork have to be the same type as original" msgid "Fork have to be the same type as parent" msgstr "Le fork doit être du même type que l’original" @@ -1215,7 +1180,6 @@ msgstr "Cette adresse e-mail est déjà enregistrée" #: rhodecode/model/validators.py:544 #, fuzzy, python-format -#| msgid "This e-mail address doesn't exist." msgid "e-mail \"%(email)s\" does not exist." msgstr "Cette adresse e-mail n’existe pas" @@ -1241,7 +1205,7 @@ msgstr "Tableau de bord" msgid "quick filter..." msgstr "Filtre rapide…" -#: 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 "Dépôts" @@ -1662,6 +1626,7 @@ msgid "E-mail Attribute" msgstr "Attribut pour l’e-mail" #: 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 @@ -1683,13 +1648,12 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:30 #, fuzzy -#| msgid "commits" msgid "Comments" msgstr "commits" #: 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 "" @@ -1797,7 +1761,6 @@ msgstr "Groupe de dépôt" #: rhodecode/templates/admin/repos/repo_add_base.html:33 #: rhodecode/templates/forks/fork.html:54 #, fuzzy -#| msgid "Optional select a group to put this repository into." msgid "Optionaly select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." @@ -1814,7 +1777,6 @@ msgstr "Type de dépôt à créer." #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 #, fuzzy -#| msgid "next revision" msgid "Landing revision" msgstr "révision suivante" @@ -1895,6 +1857,22 @@ msgstr "Afficher le menu de téléchargements sur la page du dépôt." msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." +#: 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 "Réinitialiser" + #: rhodecode/templates/admin/repos/repo_edit.html:143 msgid "Administration" msgstr "Administration" @@ -1944,9 +1922,9 @@ msgid "Confirm to invalidate repository msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" #: 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 "Journal public" @@ -1993,13 +1971,11 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:222 #, fuzzy -#| msgid "Set as fork" msgid "Set as fork of" msgstr "Indiquer comme fork" #: rhodecode/templates/admin/repos/repo_edit.html:231 #, fuzzy -#| msgid "Manually set this repository as a fork of another" msgid "Manually set this repository as a fork of another from the list" msgstr "Permet d’indiquer manuellement que ce dépôt est un fork d’un autre dépôt." @@ -2021,7 +1997,7 @@ msgstr "Écriture" #: 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 "Administration" @@ -2129,21 +2105,6 @@ msgstr "Éditer le groupe de dépôt" msgid "edit repos group" msgstr "Édition du groupe de dépôt" -#: 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 "Réinitialiser" - #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "Administration des groupes de dépôts" @@ -2405,25 +2366,21 @@ msgstr "Permission" #: rhodecode/templates/admin/users/user_edit.html:210 #, fuzzy -#| msgid "Email address" msgid "Email addresses" msgstr "Adresse e-mail" #: rhodecode/templates/admin/users/user_edit.html:223 #, fuzzy, python-format -#| msgid "Confirm to delete this user: %s" msgid "Confirm to delete this email: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" #: rhodecode/templates/admin/users/user_edit.html:237 #, fuzzy -#| msgid "Email address" msgid "New email address" msgstr "Adresse e-mail" #: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy -#| msgid "add" msgid "Add" msgstr "Ajouter" @@ -2506,7 +2463,7 @@ msgid "active" msgstr "Actif" #: rhodecode/templates/admin/users/users.html:39 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "LDAP" @@ -2605,9 +2562,9 @@ msgid "Inbox" msgstr "Boîte de réception" #: 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: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 @@ -2631,9 +2588,9 @@ msgid "Home" msgstr "Accueil" #: 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: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 @@ -2699,7 +2656,7 @@ msgstr "Options" #: 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 "Réglages" @@ -2710,38 +2667,43 @@ msgid "fork" msgstr "Fork" #: 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 "Rechercher" -#: rhodecode/templates/base/base.html:219 +#: rhodecode/templates/base/base.html:220 msgid "repositories groups" msgstr "Groupes de dépôts" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:221 msgid "users" msgstr "Utilisateurs" -#: rhodecode/templates/base/base.html:221 -msgid "users groups" -msgstr "Groupes d’utilisateurs" - #: rhodecode/templates/base/base.html:222 +msgid "users groups" +msgstr "Groupes d’utilisateurs" + +#: rhodecode/templates/base/base.html:223 msgid "permissions" msgstr "Permissions" -#: 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 "Followers" -#: 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 "Forks" -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 +#: 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 "Rechercher" @@ -2793,7 +2755,6 @@ msgstr "Branches de %s" #: rhodecode/templates/branches/branches.html:29 #, fuzzy -#| msgid "branches" msgid "Compare branches" msgstr "Branches" @@ -2801,7 +2762,6 @@ msgstr "Branches" #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 #, fuzzy -#| msgid "compare view" msgid "Compare" msgstr "vue de comparaison" @@ -2821,7 +2781,6 @@ msgstr "Révision" #: rhodecode/templates/branches/branches_data.html:10 #, fuzzy -#| msgid "compare view" msgid "compare" msgstr "vue de comparaison" @@ -2844,14 +2803,9 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:37 #, fuzzy -#| msgid "compare view" msgid "Compare fork" msgstr "vue de comparaison" -#: rhodecode/templates/changelog/changelog.html:39 -msgid "Open new pull request" -msgstr "" - #: rhodecode/templates/changelog/changelog.html:44 msgid "Show" msgstr "Afficher" @@ -2870,7 +2824,6 @@ msgstr "Nombre de fichiers modifiés, cliquez pour plus de détails" #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy -#| msgid "Changesets" msgid "Changeset status" msgstr "Changesets" @@ -3039,7 +2992,6 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:118 #, fuzzy -#| msgid "Changesets" msgid "change status" msgstr "Changesets" @@ -3069,13 +3021,11 @@ msgstr "Afficher les commentaires" #: rhodecode/templates/compare/compare_cs.html:5 #, fuzzy -#| msgid "No changesets yet" msgid "No changesets" msgstr "Dépôt vide" #: rhodecode/templates/compare/compare_diff.html:37 #, fuzzy -#| msgid "No changesets yet" msgid "Outgoing changesets" msgstr "Dépôt vide" @@ -3277,19 +3227,16 @@ msgstr "Historique" #: rhodecode/templates/files/files_source.html:9 #, fuzzy -#| msgid "next revision" msgid "diff to revision" msgstr "révision suivante" #: rhodecode/templates/files/files_source.html:10 #, fuzzy -#| msgid "next revision" msgid "show at revision" msgstr "révision suivante" #: rhodecode/templates/files/files_source.html:14 #, fuzzy, python-format -#| msgid "author" msgid "%s author" msgid_plural "%s authors" msgstr[0] "Auteur" @@ -3388,14 +3335,12 @@ msgid "There are no forks yet" msgstr "Il n’y a pas encore de forks." #: rhodecode/templates/journal/journal.html:13 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "ATOM journal feed" msgstr "%s — Flux %s du journal public" #: rhodecode/templates/journal/journal.html:14 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "RSS journal feed" msgstr "%s — Flux %s du journal public" @@ -3406,8 +3351,7 @@ msgstr "Rafraîchir" #: rhodecode/templates/journal/journal.html:27 #: rhodecode/templates/journal/public_journal.html:24 -#, fuzzy, python-format -#| msgid "%s %s feed" +#, fuzzy msgid "RSS feed" msgstr "Flux %s de %s" @@ -3437,14 +3381,12 @@ msgid "No entries yet" msgstr "Aucune entrée pour le moment" #: rhodecode/templates/journal/public_journal.html:13 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "ATOM public journal feed" msgstr "%s — Flux %s du journal public" #: rhodecode/templates/journal/public_journal.html:14 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "RSS public journal feed" msgstr "%s — Flux %s du journal public" @@ -3463,7 +3405,6 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:66 #, fuzzy -#| msgid "compare view" msgid "Detailed compare view" msgstr "vue de comparaison" @@ -3478,26 +3419,22 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:95 #, fuzzy -#| msgid "Available members" msgid "Available reviewers" msgstr "Membres disponibles" #: rhodecode/templates/pullrequests/pullrequest.html:108 #, fuzzy -#| msgid "Create new file" msgid "Create new pull request" msgstr "Créer un nouveau fichier" #: rhodecode/templates/pullrequests/pullrequest.html:117 #: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, fuzzy -#| msgid "write" msgid "Title" msgstr "Écriture" #: rhodecode/templates/pullrequests/pullrequest.html:126 #, fuzzy -#| msgid "Description" msgid "description" msgstr "Description" @@ -3517,19 +3454,16 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:33 #, fuzzy -#| msgid "create one now" msgid "Created on" msgstr "En créer un maintenant" #: rhodecode/templates/pullrequests/pullrequest_show.html:63 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "vue de comparaison" #: rhodecode/templates/pullrequests/pullrequest_show.html:67 #, fuzzy -#| msgid "No changesets yet" msgid "Incoming changesets" msgstr "Dépôt vide" @@ -3540,27 +3474,23 @@ msgstr "" #: rhodecode/templates/search/search.html:6 #, fuzzy, python-format -#| msgid "in repository: " msgid "Search \"%s\" in repository: %s" msgstr "dans le dépôt :" #: rhodecode/templates/search/search.html:8 #, fuzzy, python-format -#| msgid "in all repositories" msgid "Search \"%s\" in all repositories" msgstr "dans tous les dépôts" #: rhodecode/templates/search/search.html:12 #: rhodecode/templates/search/search.html:32 #, fuzzy, python-format -#| msgid "in repository: " msgid "Search in repository: %s" msgstr "dans le dépôt :" #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:34 #, fuzzy -#| msgid "in all repositories" msgid "Search in all repositories" msgstr "dans tous les dépôts" @@ -3630,13 +3560,11 @@ msgstr "résumé" #: rhodecode/templates/summary/summary.html:20 #, fuzzy, python-format -#| msgid "Subscribe to %s atom feed" msgid "repo %s ATOM feed" msgstr "S’abonner au flux ATOM de %s" #: rhodecode/templates/summary/summary.html:21 #, fuzzy, python-format -#| msgid "Subscribe to %s rss feed" msgid "repo %s RSS feed" msgstr "S’abonner au flux RSS de %s" @@ -3762,18 +3690,3 @@ msgstr "fichier supprimé" msgid "%s Tags" msgstr "Tags de %s" -#~ msgid "Invalid username" -#~ msgstr "Nom d’utilisateur invalide" - -#~ msgid "Invalid group name" -#~ msgstr "Nom de groupe invalide" - -#~ msgid "This group already exists" -#~ msgstr "Ce groupe existe déjà." - -#~ msgid "This username is not valid" -#~ msgstr "Ce nom d’utilisateur n’est plus valide" - -#~ msgid "There is a group with this name already \"%s\"" -#~ msgstr "Un groupe portant le nom « %s » existe déjà." - diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\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: 2012-06-20 08:53+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: ja \n" @@ -83,76 +83,76 @@ msgstr "%s %s フィード" 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 "まだファイルがありません %s" -#: rhodecode/controllers/files.py:256 +#: rhodecode/controllers/files.py:254 #, python-format msgid "Edited %s via RhodeCode" msgstr "RhodeCode経由で %s を変更" -#: 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 "%s へのコミットが成功しました" -#: 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経由で %s を追加" -#: 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:369 +#: rhodecode/controllers/files.py:367 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:369 msgid "Empty repository" msgstr "空のリポジトリ" -#: rhodecode/controllers/files.py:373 +#: rhodecode/controllers/files.py:371 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 "タグ" @@ -188,7 +188,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 "" @@ -206,20 +206,20 @@ msgid "" "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 "%s (所有者)" -#: 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 "プルリクエストの作成中にエラーが発生しました" @@ -365,9 +365,9 @@ msgstr "書込" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:334 -#: rhodecode/templates/base/base.html:336 -#: rhodecode/templates/base/base.html:338 +#: rhodecode/templates/base/base.html:335 +#: rhodecode/templates/base/base.html:337 +#: rhodecode/templates/base/base.html:339 msgid "Admin" msgstr "管理" @@ -492,7 +492,7 @@ msgstr "リポジトリグループ %s を更新しました" msgid "error occurred during update of repos group %s" msgstr "リポジトリグループ %s を更新中にエラーが発生しました" -#: 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 "このグループは %s リポジトリを含んでいるため削除出来ません" @@ -562,12 +562,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 "ユーザ %s の更新中にエラーが発生しました" @@ -843,84 +843,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" +msgid "Repository admin access" msgstr "" -#: rhodecode/model/db.py:1076 -msgid "Register new user with RhodeCode with manual activation" +#: 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 "レビュー中" @@ -966,7 +966,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 "" @@ -975,19 +975,19 @@ msgstr "" msgid "latest tip" msgstr "最新のtip" -#: 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 " @@ -1133,7 +1133,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 "リポジトリ" @@ -1554,6 +1554,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 @@ -1578,8 +1579,8 @@ 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 "プルリクエスト" @@ -1774,6 +1775,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 "管理" @@ -1823,9 +1840,9 @@ 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 "" @@ -1890,7 +1907,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 "管理" @@ -1998,21 +2015,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 "" @@ -2363,7 +2365,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 "ldap" @@ -2462,9 +2464,9 @@ 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: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 @@ -2488,9 +2490,9 @@ 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: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 @@ -2556,7 +2558,7 @@ 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 "設定" @@ -2567,38 +2569,43 @@ 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 +#: rhodecode/templates/base/base.html:220 msgid "repositories groups" msgstr "リポジトリグループ" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:221 msgid "users" msgstr "ユーザ" -#: rhodecode/templates/base/base.html:221 -msgid "users groups" -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/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 "検索" @@ -2696,10 +2703,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 "表示" diff --git a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\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: 2012-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann \n" "Language-Team: pt_BR \n" @@ -81,80 +81,79 @@ msgstr "%s - feed %s" #: rhodecode/controllers/feed.py:75 #, fuzzy -#| msgid "commit" msgid "commited on" msgstr "commit" -#: rhodecode/controllers/files.py:86 +#: rhodecode/controllers/files.py:84 #: rhodecode/templates/admin/repos/repo_add.html:13 msgid "add new" msgstr "adicionar novo" -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/files.py:85 #, python-format msgid "There are no files yet %s" msgstr "Ainda não há arquivos %s" -#: rhodecode/controllers/files.py:256 +#: rhodecode/controllers/files.py:254 #, python-format msgid "Edited %s via RhodeCode" msgstr "Editado %s via RhodeCode" -#: rhodecode/controllers/files.py:261 +#: rhodecode/controllers/files.py:259 msgid "No changes" msgstr "Sem alterações" -#: 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 "Commit realizado com sucesso para %s" -#: 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 "Ocorreu um erro ao realizar commit" -#: rhodecode/controllers/files.py:298 +#: rhodecode/controllers/files.py:296 #, python-format msgid "Added %s via RhodeCode" msgstr "Adicionado %s via RhodeCode" -#: rhodecode/controllers/files.py:312 +#: rhodecode/controllers/files.py:310 msgid "No content" msgstr "Nenhum conteúdo" -#: rhodecode/controllers/files.py:316 +#: rhodecode/controllers/files.py:314 msgid "No filename" msgstr "Nenhum nomes de arquivo" -#: rhodecode/controllers/files.py:358 +#: rhodecode/controllers/files.py:356 msgid "downloads disabled" msgstr "downloads desabilitados" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:367 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:369 msgid "Empty repository" msgstr "Repositório vazio" -#: rhodecode/controllers/files.py:373 +#: rhodecode/controllers/files.py:371 msgid "Unknown archive type" msgstr "Arquivo de tipo desconhecido" -#: 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 "Conjuntos de mudanças" -#: 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 "Ramos" -#: 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 "Etiquetas" @@ -193,12 +192,11 @@ msgstr "Ocorreu um erro ao bifurcar o repositório %s" #: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 #, fuzzy -#| msgid "Public journal" msgid "public journal" msgstr "Diário público" #: 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 "diário" @@ -218,24 +216,22 @@ msgstr "" "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " "seu e-mail" -#: rhodecode/controllers/pullrequests.py:67 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 msgid "Bookmarks" msgstr "Marcadores" -#: 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 #, fuzzy -#| msgid "successfully deleted user" msgid "Successfully opened new pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:145 -#, fuzzy, python-format -#| msgid "error occurred during creation of repository %s" +#: rhodecode/controllers/pullrequests.py:164 +#, fuzzy msgid "Error occurred during sending pull request" msgstr "ocorreu um erro ao criar o repositório %s" @@ -384,9 +380,9 @@ msgstr "Gravar" #: 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:335 +#: rhodecode/templates/base/base.html:337 +#: rhodecode/templates/base/base.html:339 msgid "Admin" msgstr "Administrador" @@ -511,7 +507,7 @@ msgstr "atualizado grupo de repositórios %s" msgid "error occurred during update of repos group %s" msgstr "ocorreu um erro ao atualizar grupo de repositórios %s" -#: 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 "Esse grupo contém %s repositórios e não pode ser excluído" @@ -581,12 +577,12 @@ msgstr "Tarefa de e-mail criada" msgid "You can't edit this user since it's crucial for entire application" msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação" -#: rhodecode/controllers/admin/settings.py:368 +#: rhodecode/controllers/admin/settings.py:367 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: 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 "ocorreu um erro ao atualizar o usuário %s" @@ -634,13 +630,11 @@ msgstr "" #: rhodecode/controllers/admin/users.py:241 #, fuzzy -#| msgid "An error occurred during this operation" msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante essa operação" #: rhodecode/controllers/admin/users.py:251 -#, fuzzy, python-format -#| msgid "removed repos group %s" +#, fuzzy msgid "Removed email from user" msgstr "removido grupo de repositórios %s" @@ -784,7 +778,6 @@ msgstr "repositório [criado]" #: rhodecode/lib/helpers.py:605 #, fuzzy -#| msgid "[commented] on revision in repository" msgid "[commented] on pull request" msgstr "repositório [criado]" @@ -883,110 +876,97 @@ msgstr "agora há pouco" msgid "password reset link" msgstr "link de reinicialização de senha" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:110 #, python-format msgid "on line %s" msgstr "na linha %s" -#: rhodecode/model/comment.py:146 +#: rhodecode/model/comment.py:157 msgid "[Mention]" msgstr "[Menção]" -#: rhodecode/model/db.py:1062 -#, fuzzy -#| msgid "repositories" -msgid "Repository no access" -msgstr "repositórios" - -#: rhodecode/model/db.py:1063 -#, fuzzy -#| msgid "This repository already exists" -msgid "Repository read access" -msgstr "Esse repositório já existe" - -#: rhodecode/model/db.py:1064 -#, fuzzy -#| msgid "repositories" -msgid "Repository write access" -msgstr "repositórios" - -#: rhodecode/model/db.py:1065 -#, fuzzy -#| msgid "repositories" -msgid "Repository admin access" -msgstr "repositórios" - -#: rhodecode/model/db.py:1067 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group no access" -msgstr "grupos de repositórios" - -#: rhodecode/model/db.py:1068 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group read access" -msgstr "grupos de repositórios" - -#: rhodecode/model/db.py:1069 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group write access" -msgstr "grupos de repositórios" - -#: rhodecode/model/db.py:1070 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group admin access" -msgstr "grupos de repositórios" - #: rhodecode/model/db.py:1072 #, fuzzy -#| msgid "Users administration" -msgid "RhodeCode Administrator" -msgstr "Administração de usuários" +msgid "Repository no access" +msgstr "repositórios" #: rhodecode/model/db.py:1073 #, fuzzy -#| msgid "Repository creation" -msgid "Repository creation disabled" -msgstr "Criação de repositório" +msgid "Repository read access" +msgstr "Esse repositório já existe" #: rhodecode/model/db.py:1074 #, fuzzy -#| msgid "Repository creation" -msgid "Repository creation enabled" -msgstr "Criação de repositório" +msgid "Repository write access" +msgstr "repositórios" #: rhodecode/model/db.py:1075 #, fuzzy -#| msgid "disabled" +msgid "Repository admin access" +msgstr "repositórios" + +#: rhodecode/model/db.py:1077 +#, fuzzy +msgid "Repositories Group no access" +msgstr "grupos de repositórios" + +#: rhodecode/model/db.py:1078 +#, fuzzy +msgid "Repositories Group read access" +msgstr "grupos de repositórios" + +#: rhodecode/model/db.py:1079 +#, fuzzy +msgid "Repositories Group write access" +msgstr "grupos de repositórios" + +#: rhodecode/model/db.py:1080 +#, fuzzy +msgid "Repositories Group admin access" +msgstr "grupos de repositórios" + +#: rhodecode/model/db.py:1082 +#, fuzzy +msgid "RhodeCode Administrator" +msgstr "Administração de usuários" + +#: rhodecode/model/db.py:1083 +#, fuzzy +msgid "Repository creation disabled" +msgstr "Criação de repositório" + +#: rhodecode/model/db.py:1084 +#, fuzzy +msgid "Repository creation enabled" +msgstr "Criação de repositório" + +#: rhodecode/model/db.py:1085 +#, fuzzy msgid "Register disabled" msgstr "desabilitado" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1086 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1079 +#: 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 #, fuzzy -#| msgid "removed" msgid "Approved" msgstr "removidos" -#: 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 "" @@ -1030,38 +1010,36 @@ msgstr "" #: rhodecode/model/notification.py:208 #, fuzzy -#| msgid "commented on commit" msgid "commented on pull request" msgstr "comentado no commit" -#: 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 "" #: rhodecode/model/scm.py:489 #, fuzzy -#| msgid "last login" msgid "latest tip" msgstr "último login" -#: rhodecode/model/user.py:238 +#: rhodecode/model/user.py:240 msgid "new user registration" msgstr "registro de novo usuário" -#: 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 "" "Você não pode Editar esse usuário, pois ele é crucial para toda a " "aplicação" -#: 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 "" "Você não pode remover esse usuário, pois ele é crucial para toda a " "aplicação" -#: rhodecode/model/user.py:312 +#: rhodecode/model/user.py:317 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1072,7 +1050,6 @@ msgstr "" #: rhodecode/model/validators.py:52 #, fuzzy, python-format -#| msgid "This username already exists" msgid "Username \"%(username)s\" already exists" msgstr "Esse nome de usuário já existe" @@ -1091,19 +1068,16 @@ msgstr "" #: rhodecode/model/validators.py:84 #, fuzzy, python-format -#| msgid "This username or users group name is not valid" msgid "Username %(username)s is not valid" msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido" #: rhodecode/model/validators.py:103 #, fuzzy -#| msgid "invalid user name" msgid "Invalid users group name" msgstr "nome de usuário inválido" #: rhodecode/model/validators.py:104 #, fuzzy, python-format -#| msgid "This users group already exists" msgid "Users group \"%(usersgroup)s\" already exists" msgstr "Esse grupo de usuários já existe" @@ -1122,19 +1096,16 @@ msgstr "Não é possível associar esse grupo como progenitor" #: rhodecode/model/validators.py:145 #, fuzzy, python-format -#| msgid "This username already exists" msgid "Group \"%(group_name)s\" already exists" msgstr "Esse nome de usuário já existe" #: rhodecode/model/validators.py:147 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Já existe um repositório com esse nome" #: rhodecode/model/validators.py:205 #, fuzzy -#| msgid "Invalid characters in password" msgid "Invalid characters (non-ascii) in password" msgstr "Caracteres inválidos na senha" @@ -1156,25 +1127,21 @@ msgstr "Sua conta está desabilitada" #: rhodecode/model/validators.py:283 #, fuzzy, python-format -#| msgid "This repository name is disallowed" msgid "Repository name %(repo)s is disallowed" msgstr "Esse nome de repositório não é permitido" #: rhodecode/model/validators.py:285 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repository named %(repo)s already exists" msgstr "Já existe um repositório com esse nome" #: rhodecode/model/validators.py:286 #, fuzzy, python-format -#| msgid "This repository already exists in a group \"%s\"" msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Esse repositório já existe em um grupo \"%s\"" #: rhodecode/model/validators.py:288 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "Já existe um repositório com esse nome" @@ -1188,7 +1155,6 @@ msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s" #: rhodecode/model/validators.py:418 #, fuzzy -#| msgid "Fork have to be the same type as original" msgid "Fork have to be the same type as parent" msgstr "Bifurcação precisa ser do mesmo tipo que o original" @@ -1206,7 +1172,6 @@ msgstr "Esse endereço de e-mail já está tomado" #: rhodecode/model/validators.py:544 #, fuzzy, python-format -#| msgid "This e-mail address doesn't exist." msgid "e-mail \"%(email)s\" does not exist." msgstr "Esse endereço de e-mail não existe." @@ -1232,7 +1197,7 @@ msgstr "Painel de Controle" msgid "quick filter..." msgstr "filtro rápido..." -#: 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 "repositórios" @@ -1655,6 +1620,7 @@ msgid "E-mail Attribute" msgstr "Atributo de E-mail" #: 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 @@ -1676,13 +1642,12 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:30 #, fuzzy -#| msgid "commits" msgid "Comments" msgstr "commits" #: 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 "" @@ -1790,7 +1755,6 @@ msgstr "Grupo de repositórios" #: rhodecode/templates/admin/repos/repo_add_base.html:33 #: rhodecode/templates/forks/fork.html:54 #, fuzzy -#| msgid "Optional select a group to put this repository into." msgid "Optionaly select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." @@ -1807,7 +1771,6 @@ msgstr "Tipo de repositório a criar." #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 #, fuzzy -#| msgid "next revision" msgid "Landing revision" msgstr "próxima revisão" @@ -1888,6 +1851,22 @@ msgstr "Habilitar menu de descarregar na página de sumário." msgid "Change owner of this repository." msgstr "Mudar o dono desse repositório." +#: 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 "Limpar" + #: rhodecode/templates/admin/repos/repo_edit.html:143 msgid "Administration" msgstr "Administração" @@ -1937,9 +1916,9 @@ msgid "Confirm to invalidate repository msgstr "Confirma invalidar cache do repositório" #: 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 "Diário público" @@ -1986,13 +1965,11 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:222 #, fuzzy -#| msgid "Set as fork" msgid "Set as fork of" msgstr "Marcar como bifurcação" #: rhodecode/templates/admin/repos/repo_edit.html:231 #, fuzzy -#| msgid "Manually set this repository as a fork of another" msgid "Manually set this repository as a fork of another from the list" msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro" @@ -2014,7 +1991,7 @@ msgstr "escrever" #: 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 "administrador" @@ -2034,7 +2011,6 @@ msgstr "repositório privado" #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 #, fuzzy -#| msgid "delete" msgid "default" msgstr "excluir" @@ -2124,21 +2100,6 @@ msgstr "Editar grupo de repositórios" msgid "edit repos group" msgstr "editar grupo de repositórios" -#: 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 "Limpar" - #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "Administração de grupos de repositórios" @@ -2401,25 +2362,21 @@ msgstr "Permissão" #: rhodecode/templates/admin/users/user_edit.html:210 #, fuzzy -#| msgid "Email address" msgid "Email addresses" msgstr "Endereço de e-mail" #: rhodecode/templates/admin/users/user_edit.html:223 #, fuzzy, python-format -#| msgid "Confirm to delete this user: %s" msgid "Confirm to delete this email: %s" msgstr "Confirma excluir este usuário: %s" #: rhodecode/templates/admin/users/user_edit.html:237 #, fuzzy -#| msgid "Email address" msgid "New email address" msgstr "Endereço de e-mail" #: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy -#| msgid "add" msgid "Add" msgstr "adicionar" @@ -2502,7 +2459,7 @@ msgid "active" msgstr "ativo" #: rhodecode/templates/admin/users/users.html:39 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "ldap" @@ -2601,9 +2558,9 @@ msgid "Inbox" msgstr "Caixa de Entrada" #: 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: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 @@ -2627,9 +2584,9 @@ msgid "Home" msgstr "Início" #: 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: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 @@ -2695,7 +2652,7 @@ msgstr "Opções" #: 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 "configurações" @@ -2706,38 +2663,43 @@ msgid "fork" msgstr "bifurcação" #: 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 "pesquisar" -#: rhodecode/templates/base/base.html:219 +#: rhodecode/templates/base/base.html:220 msgid "repositories groups" msgstr "grupos de repositórios" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:221 msgid "users" msgstr "usuários" -#: rhodecode/templates/base/base.html:221 -msgid "users groups" -msgstr "grupos de usuários" - #: rhodecode/templates/base/base.html:222 +msgid "users groups" +msgstr "grupos de usuários" + +#: rhodecode/templates/base/base.html:223 msgid "permissions" msgstr "permissões" -#: 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 "Seguidores" -#: 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 "Bifurcações" -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 +#: 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 "Pesquisar" @@ -2771,7 +2733,6 @@ msgstr "nenhum arquivo corresponde" #: rhodecode/templates/bookmarks/bookmarks.html:5 #, fuzzy, python-format -#| msgid "bookmarks" msgid "%s Bookmarks" msgstr "marcadores" @@ -2785,13 +2746,11 @@ msgstr "Autor" #: rhodecode/templates/branches/branches.html:5 #, fuzzy, python-format -#| msgid "branches" msgid "%s Branches" msgstr "ramos" #: rhodecode/templates/branches/branches.html:29 #, fuzzy -#| msgid "branches" msgid "Compare branches" msgstr "ramos" @@ -2799,7 +2758,6 @@ msgstr "ramos" #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 #, fuzzy -#| msgid "compare view" msgid "Compare" msgstr "comparar exibir" @@ -2819,13 +2777,11 @@ msgstr "revisão" #: rhodecode/templates/branches/branches_data.html:10 #, fuzzy -#| msgid "compare view" msgid "compare" msgstr "comparar exibir" #: rhodecode/templates/changelog/changelog.html:6 #, fuzzy, python-format -#| msgid "Changelog" msgid "%s Changelog" msgstr "Registro de alterações" @@ -2843,14 +2799,9 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:37 #, fuzzy -#| msgid "compare view" msgid "Compare fork" msgstr "comparar exibir" -#: rhodecode/templates/changelog/changelog.html:39 -msgid "Open new pull request" -msgstr "" - #: rhodecode/templates/changelog/changelog.html:44 msgid "Show" msgstr "Mostrar" @@ -2869,7 +2820,6 @@ msgstr "Número de arquivos afetados, clique para mostrar mais detalhes" #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy -#| msgid "Changesets" msgid "Changeset status" msgstr "Conjuntos de mudanças" @@ -2945,7 +2895,6 @@ msgstr "%s arquivos afetados" #: rhodecode/templates/changeset/changeset.html:6 #, fuzzy, python-format -#| msgid "Changeset" msgid "%s Changeset" msgstr "Conjunto de Mudanças" @@ -3037,13 +2986,11 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:118 #, fuzzy -#| msgid "Changesets" msgid "change status" msgstr "Conjuntos de mudanças" #: rhodecode/templates/changeset/changeset_range.html:5 #, fuzzy, python-format -#| msgid "Changesets" msgid "%s Changesets" msgstr "Conjuntos de mudanças" @@ -3068,13 +3015,11 @@ msgstr "mostrar comentários em linha" #: rhodecode/templates/compare/compare_cs.html:5 #, fuzzy -#| msgid "No changesets yet" msgid "No changesets" msgstr "Nenhum conjunto de alterações ainda." #: rhodecode/templates/compare/compare_diff.html:37 #, fuzzy -#| msgid "No changesets yet" msgid "Outgoing changesets" msgstr "Nenhum conjunto de alterações ainda." @@ -3123,7 +3068,6 @@ msgstr "Você será redirecionado para %s em %s segundos" #: rhodecode/templates/files/file_diff.html:4 #, fuzzy, python-format -#| msgid "File diff" msgid "%s File diff" msgstr "Diff do arquivo" @@ -3133,7 +3077,6 @@ msgstr "Diff do arquivo" #: rhodecode/templates/files/files.html:4 #, fuzzy, python-format -#| msgid "files" msgid "%s Files" msgstr "arquivos" @@ -3145,7 +3088,6 @@ msgstr "arquivos" #: rhodecode/templates/files/files_add.html:4 #: rhodecode/templates/files/files_edit.html:4 #, fuzzy, python-format -#| msgid "edit file" msgid "%s Edit file" msgstr "editar arquivo" @@ -3279,19 +3221,16 @@ msgstr "Histórico" #: rhodecode/templates/files/files_source.html:9 #, fuzzy -#| msgid "next revision" msgid "diff to revision" msgstr "próxima revisão" #: rhodecode/templates/files/files_source.html:10 #, fuzzy -#| msgid "next revision" msgid "show at revision" msgstr "próxima revisão" #: rhodecode/templates/files/files_source.html:14 #, fuzzy, python-format -#| msgid "author" msgid "%s author" msgid_plural "%s authors" msgstr[0] "autor" @@ -3328,7 +3267,6 @@ msgstr "Nenhum arquivo no caminho especi #: rhodecode/templates/followers/followers.html:5 #, fuzzy, python-format -#| msgid "followers" msgid "%s Followers" msgstr "seguidores" @@ -3338,13 +3276,11 @@ msgstr "seguidores" #: rhodecode/templates/followers/followers_data.html:12 #, fuzzy -#| msgid "Started following" msgid "Started following -" msgstr "Passou a seguir" #: rhodecode/templates/forks/fork.html:5 #, fuzzy, python-format -#| msgid "fork" msgid "%s Fork" msgstr "bifurcação" @@ -3378,7 +3314,6 @@ msgstr "bifurcar este repositório" #: rhodecode/templates/forks/forks.html:5 #, fuzzy, python-format -#| msgid "forks" msgid "%s Forks" msgstr "bifurcações" @@ -3395,14 +3330,12 @@ msgid "There are no forks yet" msgstr "Ainda não há bifurcações" #: rhodecode/templates/journal/journal.html:13 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "ATOM journal feed" msgstr "diário público de %s - feed %s" #: rhodecode/templates/journal/journal.html:14 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "RSS journal feed" msgstr "diário público de %s - feed %s" @@ -3413,8 +3346,7 @@ msgstr "Atualizar" #: rhodecode/templates/journal/journal.html:27 #: rhodecode/templates/journal/public_journal.html:24 -#, fuzzy, python-format -#| msgid "%s %s feed" +#, fuzzy msgid "RSS feed" msgstr "%s - feed %s" @@ -3444,14 +3376,12 @@ msgid "No entries yet" msgstr "Ainda não há entradas" #: rhodecode/templates/journal/public_journal.html:13 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "ATOM public journal feed" msgstr "diário público de %s - feed %s" #: rhodecode/templates/journal/public_journal.html:14 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "RSS public journal feed" msgstr "diário público de %s - feed %s" @@ -3470,7 +3400,6 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:66 #, fuzzy -#| msgid "compare view" msgid "Detailed compare view" msgstr "comparar exibir" @@ -3485,26 +3414,22 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:95 #, fuzzy -#| msgid "Available members" msgid "Available reviewers" msgstr "Membros disponíveis" #: rhodecode/templates/pullrequests/pullrequest.html:108 #, fuzzy -#| msgid "Create new file" msgid "Create new pull request" msgstr "Criar novo arquivo" #: rhodecode/templates/pullrequests/pullrequest.html:117 #: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, fuzzy -#| msgid "write" msgid "Title" msgstr "escrever" #: rhodecode/templates/pullrequests/pullrequest.html:126 #, fuzzy -#| msgid "Description" msgid "description" msgstr "Descrição" @@ -3524,19 +3449,16 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:33 #, fuzzy -#| msgid "create one now" msgid "Created on" msgstr "criar um agora" #: rhodecode/templates/pullrequests/pullrequest_show.html:63 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "comparar exibir" #: rhodecode/templates/pullrequests/pullrequest_show.html:67 #, fuzzy -#| msgid "No changesets yet" msgid "Incoming changesets" msgstr "Nenhum conjunto de alterações ainda." @@ -3547,27 +3469,23 @@ msgstr "" #: rhodecode/templates/search/search.html:6 #, fuzzy, python-format -#| msgid "in repository: " msgid "Search \"%s\" in repository: %s" msgstr "no repositório" #: rhodecode/templates/search/search.html:8 #, fuzzy, python-format -#| msgid "in all repositories" msgid "Search \"%s\" in all repositories" msgstr "em todos os repositórios" #: rhodecode/templates/search/search.html:12 #: rhodecode/templates/search/search.html:32 #, fuzzy, python-format -#| msgid "in repository: " msgid "Search in repository: %s" msgstr "no repositório" #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:34 #, fuzzy -#| msgid "in all repositories" msgid "Search in all repositories" msgstr "em todos os repositórios" @@ -3594,13 +3512,11 @@ msgstr "Permissão negada" #: rhodecode/templates/settings/repo_settings.html:5 #, fuzzy, python-format -#| msgid "settings" msgid "%s Settings" msgstr "configurações" #: rhodecode/templates/shortlog/shortlog.html:5 #, fuzzy, python-format -#| msgid "shortlog" msgid "%s Shortlog" msgstr "log resumido" @@ -3630,7 +3546,6 @@ msgstr "Repositório existente?" #: rhodecode/templates/summary/summary.html:4 #, fuzzy, python-format -#| msgid "summary" msgid "%s Summary" msgstr "sumário" @@ -3640,13 +3555,11 @@ msgstr "sumário" #: rhodecode/templates/summary/summary.html:20 #, fuzzy, python-format -#| msgid "Subscribe to %s atom feed" msgid "repo %s ATOM feed" msgstr "Assinar o feed atom de %s" #: rhodecode/templates/summary/summary.html:21 #, fuzzy, python-format -#| msgid "Subscribe to %s rss feed" msgid "repo %s RSS feed" msgstr "Assinar o feed rss de %s" @@ -3704,7 +3617,6 @@ msgstr "Downloads estão desabilitados para este repositório" #: rhodecode/templates/summary/summary.html:166 #, fuzzy -#| msgid "download as raw" msgid "Download as zip" msgstr "descarregar como bruto" @@ -3771,25 +3683,6 @@ msgstr "arquivo removido" #: rhodecode/templates/tags/tags.html:5 #, fuzzy, python-format -#| msgid "%s ago" msgid "%s Tags" msgstr "%s atrás" -#~ msgid "Invalid username" -#~ msgstr "Nome de usuário inválido" - -#~ msgid "Invalid group name" -#~ msgstr "Nome de grupo inválido" - -#~ msgid "This group already exists" -#~ msgstr "Esse grupo já existe" - -#~ msgid "This username is not valid" -#~ msgstr "Esse nome de usuário não é válido" - -#~ msgid "There is a group with this name already \"%s\"" -#~ msgstr "Já existe um grupo com esse nome \"%s\"" - -#~ msgid "Edit file" -#~ msgstr "Editar arquivo" - 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 "" diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\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: 2012-04-05 17:37+0800\n" "Last-Translator: mikespook \n" "Language-Team: mikespook\n" @@ -78,82 +78,81 @@ msgstr "%s %s 订阅" #: rhodecode/controllers/feed.py:75 #, fuzzy -#| msgid "commit" 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 #, fuzzy, 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 修改了 %s" -#: 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 "成功提交到 %s" -#: 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 #, fuzzy, python-format msgid "Added %s via RhodeCode" msgstr "通过 RhodeCode 修改了 %s" -#: rhodecode/controllers/files.py:312 +#: rhodecode/controllers/files.py:310 #, fuzzy msgid "No content" msgstr "文件内容" -#: rhodecode/controllers/files.py:316 +#: rhodecode/controllers/files.py:314 #, fuzzy msgid "No filename" msgstr "文件名" -#: rhodecode/controllers/files.py:358 +#: rhodecode/controllers/files.py:356 msgid "downloads disabled" msgstr "禁止下载" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:367 #, python-format msgid "Unknown revision %s" msgstr "未知版本 %s" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:369 msgid "Empty repository" msgstr "空版本库" -#: rhodecode/controllers/files.py:373 +#: rhodecode/controllers/files.py:371 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 "标签" @@ -186,12 +185,11 @@ msgstr "" #: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 #, fuzzy -#| msgid "Public journal" 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 "日志" @@ -209,24 +207,22 @@ msgid "" "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 #, fuzzy -#| msgid "successfully deleted user" msgid "Successfully opened new pull request" msgstr "用户删除成功" -#: rhodecode/controllers/pullrequests.py:145 +#: rhodecode/controllers/pullrequests.py:164 #, fuzzy -#| msgid "Error occurred during commit" msgid "Error occurred during sending pull request" msgstr "提交时发生错误" @@ -372,9 +368,9 @@ msgstr "写" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:334 -#: rhodecode/templates/base/base.html:336 -#: rhodecode/templates/base/base.html:338 +#: rhodecode/templates/base/base.html:335 +#: rhodecode/templates/base/base.html:337 +#: rhodecode/templates/base/base.html:339 msgid "Admin" msgstr "管理" @@ -500,7 +496,7 @@ msgstr "更新版本库组 %s" 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 "" @@ -571,12 +567,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 "" @@ -624,13 +620,11 @@ msgstr "" #: rhodecode/controllers/admin/users.py:241 #, fuzzy -#| msgid "An error occurred during this operation" msgid "An error occurred during email saving" msgstr "在搜索操作中发生异常" #: rhodecode/controllers/admin/users.py:251 -#, fuzzy, python-format -#| msgid "removed repos group %s" +#, fuzzy msgid "Removed email from user" msgstr "移除版本库组 %s" @@ -864,110 +858,97 @@ 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 -#, fuzzy -#| msgid "repositories" -msgid "Repository no access" -msgstr "个版本库" - -#: rhodecode/model/db.py:1063 -#, fuzzy -#| msgid "This repository already exists" -msgid "Repository read access" -msgstr "这个版本库已经存在" - -#: rhodecode/model/db.py:1064 -#, fuzzy -#| msgid "repositories" -msgid "Repository write access" -msgstr "个版本库" - -#: rhodecode/model/db.py:1065 -#, fuzzy -#| msgid "repositories" -msgid "Repository admin access" -msgstr "个版本库" - -#: rhodecode/model/db.py:1067 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group no access" -msgstr "版本库组" - -#: rhodecode/model/db.py:1068 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group read access" -msgstr "版本库组" - -#: rhodecode/model/db.py:1069 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group write access" -msgstr "版本库组" - -#: rhodecode/model/db.py:1070 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group admin access" -msgstr "版本库组" - #: rhodecode/model/db.py:1072 #, fuzzy -#| msgid "Users administration" -msgid "RhodeCode Administrator" -msgstr "用户管理员" +msgid "Repository no access" +msgstr "个版本库" #: rhodecode/model/db.py:1073 #, fuzzy -#| msgid "Repository creation" -msgid "Repository creation disabled" -msgstr "建立版本库" +msgid "Repository read access" +msgstr "这个版本库已经存在" #: rhodecode/model/db.py:1074 #, fuzzy -#| msgid "Repository creation" -msgid "Repository creation enabled" -msgstr "建立版本库" +msgid "Repository write access" +msgstr "个版本库" #: rhodecode/model/db.py:1075 #, fuzzy -#| msgid "disabled" +msgid "Repository admin access" +msgstr "个版本库" + +#: rhodecode/model/db.py:1077 +#, fuzzy +msgid "Repositories Group no access" +msgstr "版本库组" + +#: rhodecode/model/db.py:1078 +#, fuzzy +msgid "Repositories Group read access" +msgstr "版本库组" + +#: rhodecode/model/db.py:1079 +#, fuzzy +msgid "Repositories Group write access" +msgstr "版本库组" + +#: rhodecode/model/db.py:1080 +#, fuzzy +msgid "Repositories Group admin access" +msgstr "版本库组" + +#: rhodecode/model/db.py:1082 +#, fuzzy +msgid "RhodeCode Administrator" +msgstr "用户管理员" + +#: rhodecode/model/db.py:1083 +#, fuzzy +msgid "Repository creation disabled" +msgstr "建立版本库" + +#: rhodecode/model/db.py:1084 +#, fuzzy +msgid "Repository creation enabled" +msgstr "建立版本库" + +#: rhodecode/model/db.py:1085 +#, fuzzy msgid "Register disabled" msgstr "禁用" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1086 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1079 +#: 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 #, fuzzy -#| msgid "removed" 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 "" @@ -1015,31 +996,30 @@ 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 "" #: rhodecode/model/scm.py:489 #, fuzzy -#| msgid "last login" msgid "latest tip" msgstr "最后登录" -#: rhodecode/model/user.py:238 +#: rhodecode/model/user.py:240 #, fuzzy msgid "new user registration" msgstr "[RhodeCode] 新用户注册" -#: 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 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1048,7 +1028,6 @@ msgstr "由于该用户拥有版本库 %s 因而无法删除，请变更版本库所有者或删除版本库" #: rhodecode/model/validators.py:52 #, fuzzy, python-format -#| msgid "This username already exists" msgid "Username \"%(username)s\" already exists" msgstr "该用户名已经存在" @@ -1065,19 +1044,16 @@ msgstr "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头" #: rhodecode/model/validators.py:84 #, fuzzy, python-format -#| msgid "This username or users group name is not valid" msgid "Username %(username)s is not valid" msgstr "用户或用户组名称无效" #: rhodecode/model/validators.py:103 #, fuzzy -#| msgid "invalid user name" msgid "Invalid users group name" msgstr "无效用户名" #: rhodecode/model/validators.py:104 #, fuzzy, python-format -#| msgid "This users group already exists" msgid "Users group \"%(usersgroup)s\" already exists" msgstr "该用户组名称已经存在" @@ -1093,19 +1069,16 @@ msgstr "" #: rhodecode/model/validators.py:145 #, fuzzy, python-format -#| msgid "This username already exists" msgid "Group \"%(group_name)s\" already exists" msgstr "该用户名已经存在" #: rhodecode/model/validators.py:147 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repository with name \"%(group_name)s\" already exists" msgstr "这个版本库已经存在" #: rhodecode/model/validators.py:205 #, fuzzy -#| msgid "Invalid characters in password" msgid "Invalid characters (non-ascii) in password" msgstr "密码含有无效字符" @@ -1127,25 +1100,21 @@ msgstr "该帐号已被禁用" #: rhodecode/model/validators.py:283 #, fuzzy, python-format -#| msgid "This repository name is disallowed" msgid "Repository name %(repo)s is disallowed" msgstr "该版本库名称被禁用" #: rhodecode/model/validators.py:285 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repository named %(repo)s already exists" msgstr "这个版本库已经存在" #: rhodecode/model/validators.py:286 #, fuzzy, python-format -#| msgid "This repository already exists in a group \"%s\"" msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "组中已经存在该版本库" #: rhodecode/model/validators.py:288 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "这个版本库已经存在" @@ -1159,7 +1128,6 @@ msgstr "" #: rhodecode/model/validators.py:418 #, fuzzy -#| msgid "Fork have to be the same type as original" msgid "Fork have to be the same type as parent" msgstr "分支必须使用相同的版本库类型" @@ -1177,7 +1145,6 @@ msgstr "该邮件地址已被使用" #: rhodecode/model/validators.py:544 #, fuzzy, python-format -#| msgid "This e-mail address doesn't exist." msgid "e-mail \"%(email)s\" does not exist." msgstr "该邮件地址不存在" @@ -1201,7 +1168,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 "个版本库" @@ -1627,6 +1594,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 @@ -1648,13 +1616,12 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:30 #, fuzzy -#| msgid "commits" 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 "" @@ -1778,7 +1745,6 @@ msgstr "建立版本库" #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 #, fuzzy -#| msgid "next revision" msgid "Landing revision" msgstr "下一个修订" @@ -1856,6 +1822,22 @@ msgstr "" msgid "Change owner of this repository." msgstr "%s 库的修改" +#: 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 "管理" @@ -1905,9 +1887,9 @@ 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 "公共日志" @@ -1972,7 +1954,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 "管理员" @@ -1992,7 +1974,6 @@ msgstr "私有版本库" #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 #, fuzzy -#| msgid "delete" msgid "default" msgstr "删除" @@ -2082,21 +2063,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 "版本库管理员" @@ -2359,25 +2325,21 @@ msgstr "权限" #: rhodecode/templates/admin/users/user_edit.html:210 #, fuzzy -#| msgid "Email address" msgid "Email addresses" msgstr "邮件地址" #: rhodecode/templates/admin/users/user_edit.html:223 #, fuzzy, python-format -#| msgid "Confirm to delete this user: %s" msgid "Confirm to delete this email: %s" msgstr "确认删除该用户" #: rhodecode/templates/admin/users/user_edit.html:237 #, fuzzy -#| msgid "Email address" msgid "New email address" msgstr "邮件地址" #: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy -#| msgid "add" msgid "Add" msgstr "新增" @@ -2463,7 +2425,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 "" @@ -2564,9 +2526,9 @@ 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: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 @@ -2590,9 +2552,9 @@ 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: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 @@ -2658,7 +2620,7 @@ 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 "设置" @@ -2669,38 +2631,43 @@ 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 +#: rhodecode/templates/base/base.html:220 msgid "repositories groups" msgstr "版本库组" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:221 msgid "users" msgstr "用户" -#: rhodecode/templates/base/base.html:221 -msgid "users groups" -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/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 "搜索" @@ -2749,13 +2716,11 @@ msgstr "作者" #: rhodecode/templates/branches/branches.html:5 #, fuzzy, python-format -#| msgid "branches" msgid "%s Branches" msgstr "分支" #: rhodecode/templates/branches/branches.html:29 #, fuzzy -#| msgid "branches" msgid "Compare branches" msgstr "分支" @@ -2763,7 +2728,6 @@ msgstr "分支" #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 #, fuzzy -#| msgid "Compare View" msgid "Compare" msgstr "比较显示" @@ -2783,13 +2747,11 @@ msgstr "修订" #: rhodecode/templates/branches/branches_data.html:10 #, fuzzy -#| msgid "Compare View" msgid "compare" msgstr "比较显示" #: rhodecode/templates/changelog/changelog.html:6 #, fuzzy, python-format -#| msgid "Changelog" msgid "%s Changelog" msgstr "修改记录" @@ -2808,10 +2770,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 "显示" @@ -2830,7 +2788,6 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy -#| msgid "Changesets" msgid "Changeset status" msgstr "变更集" @@ -2906,7 +2863,6 @@ msgstr "" #: rhodecode/templates/changeset/changeset.html:6 #, fuzzy, python-format -#| msgid "No changes" msgid "%s Changeset" msgstr "无变更" @@ -2996,13 +2952,11 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:118 #, fuzzy -#| msgid "Changesets" msgid "change status" msgstr "变更集" #: rhodecode/templates/changeset/changeset_range.html:5 #, fuzzy, python-format -#| msgid "Changesets" msgid "%s Changesets" msgstr "变更集" @@ -3028,13 +2982,11 @@ msgstr "文件内容" #: rhodecode/templates/compare/compare_cs.html:5 #, fuzzy -#| msgid "No changesets yet" msgid "No changesets" msgstr "尚无修订" #: rhodecode/templates/compare/compare_diff.html:37 #, fuzzy -#| msgid "No changesets yet" msgid "Outgoing changesets" msgstr "尚无修订" @@ -3083,7 +3035,6 @@ msgstr "" #: rhodecode/templates/files/file_diff.html:4 #, fuzzy, python-format -#| msgid "File diff" msgid "%s File diff" msgstr "文件 diff" @@ -3093,7 +3044,6 @@ msgstr "文件 diff" #: rhodecode/templates/files/files.html:4 #, fuzzy, python-format -#| msgid "files" msgid "%s Files" msgstr "文件" @@ -3105,7 +3055,6 @@ msgstr "文件" #: rhodecode/templates/files/files_add.html:4 #: rhodecode/templates/files/files_edit.html:4 #, fuzzy, python-format -#| msgid "edit file" msgid "%s Edit file" msgstr "编辑文件" @@ -3249,19 +3198,16 @@ msgstr "历史" #: rhodecode/templates/files/files_source.html:9 #, fuzzy -#| msgid "next revision" msgid "diff to revision" msgstr "下一个修订" #: rhodecode/templates/files/files_source.html:10 #, fuzzy -#| msgid "next revision" msgid "show at revision" msgstr "下一个修订" #: rhodecode/templates/files/files_source.html:14 #, fuzzy, python-format -#| msgid "author" msgid "%s author" msgid_plural "%s authors" msgstr[0] "作者" @@ -3298,7 +3244,6 @@ msgstr "" #: rhodecode/templates/followers/followers.html:5 #, fuzzy, python-format -#| msgid "followers" msgid "%s Followers" msgstr "跟随者" @@ -3308,13 +3253,11 @@ msgstr "跟随者" #: rhodecode/templates/followers/followers_data.html:12 #, fuzzy -#| msgid "Started following" msgid "Started following -" msgstr "开始跟随" #: rhodecode/templates/forks/fork.html:5 #, fuzzy, python-format -#| msgid "forks" msgid "%s Fork" msgstr "分支" @@ -3349,7 +3292,6 @@ msgstr "对该版本库建立分支" #: rhodecode/templates/forks/forks.html:5 #, fuzzy, python-format -#| msgid "forks" msgid "%s Forks" msgstr "分支" @@ -3366,14 +3308,12 @@ msgid "There are no forks yet" msgstr "尚未有任何分支" #: rhodecode/templates/journal/journal.html:13 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "ATOM journal feed" msgstr "公共日志 %s %s 订阅" #: rhodecode/templates/journal/journal.html:14 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "RSS journal feed" msgstr "公共日志 %s %s 订阅" @@ -3384,8 +3324,7 @@ msgstr "" #: rhodecode/templates/journal/journal.html:27 #: rhodecode/templates/journal/public_journal.html:24 -#, fuzzy, python-format -#| msgid "%s %s feed" +#, fuzzy msgid "RSS feed" msgstr "%s %s 订阅" @@ -3416,14 +3355,12 @@ msgid "No entries yet" msgstr "" #: rhodecode/templates/journal/public_journal.html:13 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "ATOM public journal feed" msgstr "公共日志 %s %s 订阅" #: rhodecode/templates/journal/public_journal.html:14 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "RSS public journal feed" msgstr "公共日志 %s %s 订阅" @@ -3442,7 +3379,6 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:66 #, fuzzy -#| msgid "Compare View" msgid "Detailed compare view" msgstr "比较显示" @@ -3457,26 +3393,22 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:95 #, fuzzy -#| msgid "Available members" msgid "Available reviewers" msgstr "启用成员" #: rhodecode/templates/pullrequests/pullrequest.html:108 #, fuzzy -#| msgid "Create new file" msgid "Create new pull request" msgstr "创建用户 %s" #: rhodecode/templates/pullrequests/pullrequest.html:117 #: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, fuzzy -#| msgid "write" msgid "Title" msgstr "写" #: rhodecode/templates/pullrequests/pullrequest.html:126 #, fuzzy -#| msgid "Description" msgid "description" msgstr "描述" @@ -3496,19 +3428,16 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:33 #, fuzzy -#| msgid "[created] user" msgid "Created on" msgstr "创建用户 %s" #: rhodecode/templates/pullrequests/pullrequest_show.html:63 #, fuzzy -#| msgid "Compare View" msgid "Compare view" msgstr "比较显示" #: rhodecode/templates/pullrequests/pullrequest_show.html:67 #, fuzzy -#| msgid "No changesets yet" msgid "Incoming changesets" msgstr "尚无修订" @@ -3519,27 +3448,23 @@ msgstr "" #: rhodecode/templates/search/search.html:6 #, fuzzy, python-format -#| msgid "in repository: " msgid "Search \"%s\" in repository: %s" msgstr "在版本库：" #: rhodecode/templates/search/search.html:8 #, fuzzy, python-format -#| msgid "in all repositories" msgid "Search \"%s\" in all repositories" msgstr "在所有的版本库" #: rhodecode/templates/search/search.html:12 #: rhodecode/templates/search/search.html:32 #, fuzzy, python-format -#| msgid "in repository: " msgid "Search in repository: %s" msgstr "在版本库：" #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:34 #, fuzzy -#| msgid "in all repositories" msgid "Search in all repositories" msgstr "在所有的版本库" @@ -3566,13 +3491,11 @@ msgstr "权限不足" #: rhodecode/templates/settings/repo_settings.html:5 #, fuzzy, python-format -#| msgid "settings" msgid "%s Settings" msgstr "设置" #: rhodecode/templates/shortlog/shortlog.html:5 #, fuzzy, python-format -#| msgid "shortlog" msgid "%s Shortlog" msgstr "简短日志" @@ -3604,7 +3527,6 @@ msgstr "Git 版本库" #: rhodecode/templates/summary/summary.html:4 #, fuzzy, python-format -#| msgid "summary" msgid "%s Summary" msgstr "概要" @@ -3614,13 +3536,11 @@ msgstr "概要" #: rhodecode/templates/summary/summary.html:20 #, fuzzy, python-format -#| msgid "Subscribe to %s atom feed" msgid "repo %s ATOM feed" msgstr "订阅 atom %s" #: rhodecode/templates/summary/summary.html:21 #, fuzzy, python-format -#| msgid "Subscribe to %s rss feed" msgid "repo %s RSS feed" msgstr "订阅 rss %s" @@ -3680,7 +3600,6 @@ msgstr "这个版本库的下载已经禁用" #: rhodecode/templates/summary/summary.html:166 #, fuzzy -#| msgid "download as raw" msgid "Download as zip" msgstr "下载原始文件" @@ -3748,38 +3667,6 @@ msgstr "文件已删除" #: rhodecode/templates/tags/tags.html:5 #, fuzzy, python-format -#| msgid "%s ago" msgid "%s Tags" msgstr "之前" -#~ msgid "Invalid username" -#~ msgstr "非法的用户名" - -#~ msgid "Invalid group name" -#~ msgstr "非法的用户组名称" - -#~ msgid "This group already exists" -#~ msgstr "该组已经存在" - -#~ msgid "This username is not valid" -#~ msgstr "该用户名不合法" - -#~ msgid "There is a group with this name already \"%s\"" -#~ msgstr "" - -#~ msgid "" -#~ "The LDAP Login attribute of the CN" -#~ " must be specified - this is " -#~ "the name of the attribute that is" -#~ " equivalent to 'username'" -#~ msgstr "" - -#~ msgid "Set as fork" -#~ msgstr "" - -#~ msgid "Manually set this repository as a fork of another" -#~ msgstr "" - -#~ msgid "Edit file" -#~ msgstr "编辑文件" - diff --git a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\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: 2012-05-09 22:23+0800\n" "Last-Translator: Nansen \n" "Language-Team: zh_TW \n" @@ -78,82 +78,81 @@ msgstr "" #: rhodecode/controllers/feed.py:75 #, fuzzy -#| msgid "commit" 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 #, fuzzy, 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 編輯 %s" -#: 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 "成功遞交至 %s" -#: 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 #, fuzzy, python-format msgid "Added %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:312 +#: rhodecode/controllers/files.py:310 #, fuzzy msgid "No content" msgstr "文件內容" -#: rhodecode/controllers/files.py:316 +#: rhodecode/controllers/files.py:314 #, fuzzy msgid "No filename" msgstr "檔案名稱" -#: rhodecode/controllers/files.py:358 +#: rhodecode/controllers/files.py:356 msgid "downloads disabled" msgstr "下載已關閉" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:367 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:369 msgid "Empty repository" msgstr "空的版本庫" -#: rhodecode/controllers/files.py:373 +#: rhodecode/controllers/files.py:371 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 "標籤" @@ -186,12 +185,11 @@ msgstr "" #: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 #, fuzzy -#| msgid "Public journal" 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 "日誌" @@ -209,22 +207,21 @@ msgid "" "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 #, fuzzy -#| msgid "successfully deleted user" 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 "" @@ -370,9 +367,9 @@ msgstr "寫" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:334 -#: rhodecode/templates/base/base.html:336 -#: rhodecode/templates/base/base.html:338 +#: rhodecode/templates/base/base.html:335 +#: rhodecode/templates/base/base.html:337 +#: rhodecode/templates/base/base.html:339 msgid "Admin" msgstr "管理" @@ -497,7 +494,7 @@ msgstr "更新版本庫群組 %s" 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 "" @@ -567,12 +564,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 "" @@ -623,8 +620,7 @@ msgid "An error occurred during email sa msgstr "" #: rhodecode/controllers/admin/users.py:251 -#, fuzzy, python-format -#| msgid "removed repos group %s" +#, fuzzy msgid "Removed email from user" msgstr "移除版本庫群組 %s" @@ -857,110 +853,97 @@ 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 -#, fuzzy -#| msgid "repositories" -msgid "Repository no access" -msgstr "個版本庫" - -#: rhodecode/model/db.py:1063 -#, fuzzy -#| msgid "This repository already exists" -msgid "Repository read access" -msgstr "這個版本庫已經存在" - -#: rhodecode/model/db.py:1064 -#, fuzzy -#| msgid "repositories" -msgid "Repository write access" -msgstr "個版本庫" - -#: rhodecode/model/db.py:1065 -#, fuzzy -#| msgid "repositories" -msgid "Repository admin access" -msgstr "個版本庫" - -#: rhodecode/model/db.py:1067 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group no access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1068 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group read access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1069 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group write access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1070 -#, fuzzy -#| msgid "repositories groups" -msgid "Repositories Group admin access" -msgstr "版本庫群組" - #: rhodecode/model/db.py:1072 #, fuzzy -#| msgid "Users administration" -msgid "RhodeCode Administrator" -msgstr "使用者管理員" +msgid "Repository no access" +msgstr "個版本庫" #: rhodecode/model/db.py:1073 #, fuzzy -#| msgid "Repository creation" -msgid "Repository creation disabled" -msgstr "版本庫建立" +msgid "Repository read access" +msgstr "這個版本庫已經存在" #: rhodecode/model/db.py:1074 #, fuzzy -#| msgid "Repository creation" -msgid "Repository creation enabled" -msgstr "版本庫建立" +msgid "Repository write access" +msgstr "個版本庫" #: rhodecode/model/db.py:1075 #, fuzzy -#| msgid "disabled" +msgid "Repository admin access" +msgstr "個版本庫" + +#: rhodecode/model/db.py:1077 +#, fuzzy +msgid "Repositories Group no access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1078 +#, fuzzy +msgid "Repositories Group read access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1079 +#, fuzzy +msgid "Repositories Group write access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1080 +#, fuzzy +msgid "Repositories Group admin access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1082 +#, fuzzy +msgid "RhodeCode Administrator" +msgstr "使用者管理員" + +#: rhodecode/model/db.py:1083 +#, fuzzy +msgid "Repository creation disabled" +msgstr "版本庫建立" + +#: rhodecode/model/db.py:1084 +#, fuzzy +msgid "Repository creation enabled" +msgstr "版本庫建立" + +#: rhodecode/model/db.py:1085 +#, fuzzy msgid "Register disabled" msgstr "停用" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1086 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1079 +#: 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 #, fuzzy -#| msgid "removed" 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 "" @@ -1008,31 +991,30 @@ 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 "" #: rhodecode/model/scm.py:489 #, fuzzy -#| msgid "last login" msgid "latest tip" msgstr "最後登入" -#: rhodecode/model/user.py:238 +#: rhodecode/model/user.py:240 #, fuzzy msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" -#: 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 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1041,7 +1023,6 @@ msgstr "這個使用者擁有 %s 個版本庫所以無法移除，請先變更版本庫擁有者或者刪除版本庫" #: rhodecode/model/validators.py:52 #, fuzzy, python-format -#| msgid "This username already exists" msgid "Username \"%(username)s\" already exists" msgstr "使用者名稱已存在" @@ -1058,19 +1039,16 @@ msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" #: rhodecode/model/validators.py:84 #, fuzzy, python-format -#| msgid "This username or users group name is not valid" msgid "Username %(username)s is not valid" msgstr "使用者名稱或群組名稱無效" #: rhodecode/model/validators.py:103 #, fuzzy -#| msgid "invalid user name" msgid "Invalid users group name" msgstr "無效的使用者名稱" #: rhodecode/model/validators.py:104 #, fuzzy, python-format -#| msgid "This users group already exists" msgid "Users group \"%(usersgroup)s\" already exists" msgstr "這個使用者群組已存在" @@ -1086,19 +1064,16 @@ msgstr "" #: rhodecode/model/validators.py:145 #, fuzzy, python-format -#| msgid "This username already exists" msgid "Group \"%(group_name)s\" already exists" msgstr "使用者名稱已存在" #: rhodecode/model/validators.py:147 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repository with name \"%(group_name)s\" already exists" msgstr "這個版本庫已經存在" #: rhodecode/model/validators.py:205 #, fuzzy -#| msgid "Invalid characters in password" msgid "Invalid characters (non-ascii) in password" msgstr "無效的字元在密碼中" @@ -1120,25 +1095,21 @@ msgstr "您的帳號已被停用" #: rhodecode/model/validators.py:283 #, fuzzy, python-format -#| msgid "This repository name is disallowed" msgid "Repository name %(repo)s is disallowed" msgstr "不允許的版本庫名稱" #: rhodecode/model/validators.py:285 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repository named %(repo)s already exists" msgstr "這個版本庫已經存在" #: rhodecode/model/validators.py:286 #, fuzzy, python-format -#| msgid "This repository already exists in a group \"%s\"" msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "這個版本庫已存在於群組 \"%s\"" #: rhodecode/model/validators.py:288 #, fuzzy, python-format -#| msgid "Repository with this name already exists" msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "這個版本庫已經存在" @@ -1152,7 +1123,6 @@ msgstr "" #: rhodecode/model/validators.py:418 #, fuzzy -#| msgid "Fork have to be the same type as original" msgid "Fork have to be the same type as parent" msgstr "Fork 必須使用相同的版本庫類型" @@ -1170,7 +1140,6 @@ msgstr "這個郵件位址已經使用了" #: rhodecode/model/validators.py:544 #, fuzzy, python-format -#| msgid "This e-mail address doesn't exist." msgid "e-mail \"%(email)s\" does not exist." msgstr "這個郵件位址不存在" @@ -1194,7 +1163,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 "個版本庫" @@ -1620,6 +1589,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 @@ -1641,13 +1611,12 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:30 #, fuzzy -#| msgid "commits" 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 "" @@ -1770,7 +1739,6 @@ msgstr "版本庫建立" #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 #, fuzzy -#| msgid "next revision" msgid "Landing revision" msgstr "下一個修訂" @@ -1848,6 +1816,22 @@ msgstr "" msgid "Change owner of this repository." msgstr "修改於版本庫 %s" +#: 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 "管理者" @@ -1897,9 +1881,9 @@ 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 "公開日誌" @@ -1964,7 +1948,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 "管理員" @@ -1984,7 +1968,6 @@ msgstr "私有版本庫" #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 #, fuzzy -#| msgid "delete" msgid "default" msgstr "刪除" @@ -2074,21 +2057,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 "版本庫群組管理員" @@ -2351,25 +2319,21 @@ msgstr "權限" #: rhodecode/templates/admin/users/user_edit.html:210 #, fuzzy -#| msgid "Email address" msgid "Email addresses" msgstr "郵件位址" #: rhodecode/templates/admin/users/user_edit.html:223 #, fuzzy, python-format -#| msgid "Confirm to delete this user: %s" msgid "Confirm to delete this email: %s" msgstr "確認刪除這個使用者" #: rhodecode/templates/admin/users/user_edit.html:237 #, fuzzy -#| msgid "Email address" msgid "New email address" msgstr "郵件位址" #: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy -#| msgid "add" msgid "Add" msgstr "新增" @@ -2455,7 +2419,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 "" @@ -2556,9 +2520,9 @@ 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: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 @@ -2582,9 +2546,9 @@ 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: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 @@ -2650,7 +2614,7 @@ 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 "設定" @@ -2661,38 +2625,43 @@ 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 +#: rhodecode/templates/base/base.html:220 msgid "repositories groups" msgstr "版本庫群組" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:221 msgid "users" msgstr "使用者" -#: rhodecode/templates/base/base.html:221 -msgid "users groups" -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/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 "搜尋" @@ -2741,13 +2710,11 @@ msgstr "作者" #: rhodecode/templates/branches/branches.html:5 #, fuzzy, python-format -#| msgid "branches" msgid "%s Branches" msgstr "分支" #: rhodecode/templates/branches/branches.html:29 #, fuzzy -#| msgid "branches" msgid "Compare branches" msgstr "分支" @@ -2755,7 +2722,6 @@ msgstr "分支" #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 #, fuzzy -#| msgid "Compare View" msgid "Compare" msgstr "比較顯示" @@ -2775,13 +2741,11 @@ msgstr "修訂" #: rhodecode/templates/branches/branches_data.html:10 #, fuzzy -#| msgid "Compare View" msgid "compare" msgstr "比較顯示" #: rhodecode/templates/changelog/changelog.html:6 #, fuzzy, python-format -#| msgid "Changelog" msgid "%s Changelog" msgstr "修改紀錄" @@ -2800,10 +2764,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 "顯示" @@ -2822,7 +2782,6 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy -#| msgid "Changesets" msgid "Changeset status" msgstr "變更" @@ -2898,7 +2857,6 @@ msgstr "" #: rhodecode/templates/changeset/changeset.html:6 #, fuzzy, python-format -#| msgid "No changes" msgid "%s Changeset" msgstr "沒有修改" @@ -2988,13 +2946,11 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:118 #, fuzzy -#| msgid "Changesets" msgid "change status" msgstr "變更" #: rhodecode/templates/changeset/changeset_range.html:5 #, fuzzy, python-format -#| msgid "Changesets" msgid "%s Changesets" msgstr "變更" @@ -3020,13 +2976,11 @@ msgstr "文件內容" #: rhodecode/templates/compare/compare_cs.html:5 #, fuzzy -#| msgid "No changesets yet" msgid "No changesets" msgstr "尚未有任何變更" #: rhodecode/templates/compare/compare_diff.html:37 #, fuzzy -#| msgid "No changesets yet" msgid "Outgoing changesets" msgstr "尚未有任何變更" @@ -3075,7 +3029,6 @@ msgstr "" #: rhodecode/templates/files/file_diff.html:4 #, fuzzy, python-format -#| msgid "File diff" msgid "%s File diff" msgstr "檔案差異" @@ -3085,7 +3038,6 @@ msgstr "檔案差異" #: rhodecode/templates/files/files.html:4 #, fuzzy, python-format -#| msgid "files" msgid "%s Files" msgstr "檔案" @@ -3097,7 +3049,6 @@ msgstr "檔案" #: rhodecode/templates/files/files_add.html:4 #: rhodecode/templates/files/files_edit.html:4 #, fuzzy, python-format -#| msgid "edit file" msgid "%s Edit file" msgstr "編輯檔案" @@ -3241,19 +3192,16 @@ msgstr "歷史" #: rhodecode/templates/files/files_source.html:9 #, fuzzy -#| msgid "next revision" msgid "diff to revision" msgstr "下一個修訂" #: rhodecode/templates/files/files_source.html:10 #, fuzzy -#| msgid "next revision" msgid "show at revision" msgstr "下一個修訂" #: rhodecode/templates/files/files_source.html:14 #, fuzzy, python-format -#| msgid "author" msgid "%s author" msgid_plural "%s authors" msgstr[0] "作者" @@ -3290,7 +3238,6 @@ msgstr "" #: rhodecode/templates/followers/followers.html:5 #, fuzzy, python-format -#| msgid "followers" msgid "%s Followers" msgstr "追蹤者" @@ -3300,13 +3247,11 @@ msgstr "追蹤者" #: rhodecode/templates/followers/followers_data.html:12 #, fuzzy -#| msgid "Started following" msgid "Started following -" msgstr "開始追蹤" #: rhodecode/templates/forks/fork.html:5 #, fuzzy, python-format -#| msgid "forks" msgid "%s Fork" msgstr "分支" @@ -3341,7 +3286,6 @@ msgstr "fork 這個版本庫" #: rhodecode/templates/forks/forks.html:5 #, fuzzy, python-format -#| msgid "forks" msgid "%s Forks" msgstr "分支" @@ -3358,14 +3302,12 @@ msgid "There are no forks yet" msgstr "尚未有任何 fork" #: rhodecode/templates/journal/journal.html:13 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "ATOM journal feed" msgstr "%s 公開日誌 %s feed" #: rhodecode/templates/journal/journal.html:14 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "RSS journal feed" msgstr "%s 公開日誌 %s feed" @@ -3406,14 +3348,12 @@ msgid "No entries yet" msgstr "" #: rhodecode/templates/journal/public_journal.html:13 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "ATOM public journal feed" msgstr "%s 公開日誌 %s feed" #: rhodecode/templates/journal/public_journal.html:14 -#, fuzzy, python-format -#| msgid "%s public journal %s feed" +#, fuzzy msgid "RSS public journal feed" msgstr "%s 公開日誌 %s feed" @@ -3432,7 +3372,6 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:66 #, fuzzy -#| msgid "Compare View" msgid "Detailed compare view" msgstr "比較顯示" @@ -3447,26 +3386,22 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:95 #, fuzzy -#| msgid "Available members" msgid "Available reviewers" msgstr "啟用的成員" #: rhodecode/templates/pullrequests/pullrequest.html:108 #, fuzzy -#| msgid "Create new file" msgid "Create new pull request" msgstr "建立使用者 %s" #: rhodecode/templates/pullrequests/pullrequest.html:117 #: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, fuzzy -#| msgid "write" msgid "Title" msgstr "寫" #: rhodecode/templates/pullrequests/pullrequest.html:126 #, fuzzy -#| msgid "Description" msgid "description" msgstr "描述" @@ -3486,19 +3421,16 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:33 #, fuzzy -#| msgid "[created] user" msgid "Created on" msgstr "建立使用者 %s" #: rhodecode/templates/pullrequests/pullrequest_show.html:63 #, fuzzy -#| msgid "Compare View" msgid "Compare view" msgstr "比較顯示" #: rhodecode/templates/pullrequests/pullrequest_show.html:67 #, fuzzy -#| msgid "No changesets yet" msgid "Incoming changesets" msgstr "尚未有任何變更" @@ -3509,27 +3441,23 @@ msgstr "" #: rhodecode/templates/search/search.html:6 #, fuzzy, python-format -#| msgid "in repository: " msgid "Search \"%s\" in repository: %s" msgstr "於版本庫:" #: rhodecode/templates/search/search.html:8 #, fuzzy, python-format -#| msgid "in all repositories" msgid "Search \"%s\" in all repositories" msgstr "於所有的版本庫" #: rhodecode/templates/search/search.html:12 #: rhodecode/templates/search/search.html:32 #, fuzzy, python-format -#| msgid "in repository: " msgid "Search in repository: %s" msgstr "於版本庫:" #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:34 #, fuzzy -#| msgid "in all repositories" msgid "Search in all repositories" msgstr "於所有的版本庫" @@ -3556,13 +3484,11 @@ msgstr "權限不足" #: rhodecode/templates/settings/repo_settings.html:5 #, fuzzy, python-format -#| msgid "settings" msgid "%s Settings" msgstr "設定" #: rhodecode/templates/shortlog/shortlog.html:5 #, fuzzy, python-format -#| msgid "shortlog" msgid "%s Shortlog" msgstr "簡短紀錄" @@ -3594,7 +3520,6 @@ msgstr "Git 版本庫" #: rhodecode/templates/summary/summary.html:4 #, fuzzy, python-format -#| msgid "summary" msgid "%s Summary" msgstr "概況" @@ -3604,13 +3529,11 @@ msgstr "概況" #: rhodecode/templates/summary/summary.html:20 #, fuzzy, python-format -#| msgid "Subscribe to %s atom feed" msgid "repo %s ATOM feed" msgstr "訂閱 %s atom" #: rhodecode/templates/summary/summary.html:21 #, fuzzy, python-format -#| msgid "Subscribe to %s rss feed" msgid "repo %s RSS feed" msgstr "訂閱 %s rss" @@ -3671,7 +3594,6 @@ msgstr "這個版本庫的下載已停用" #: rhodecode/templates/summary/summary.html:166 #, fuzzy -#| msgid "download as raw" msgid "Download as zip" msgstr "下載原始文件" @@ -3739,38 +3661,6 @@ msgstr "移除檔案" #: rhodecode/templates/tags/tags.html:5 #, fuzzy, python-format -#| msgid "%s ago" msgid "%s Tags" msgstr "之前" -#~ msgid "Invalid username" -#~ msgstr "無效的使用者名稱" - -#~ msgid "Invalid group name" -#~ msgstr "無效的群組名稱" - -#~ msgid "This group already exists" -#~ msgstr "這個群組已存在" - -#~ msgid "This username is not valid" -#~ msgstr "無效的使用者名稱" - -#~ msgid "There is a group with this name already \"%s\"" -#~ msgstr "" - -#~ msgid "" -#~ "The LDAP Login attribute of the CN" -#~ " must be specified - this is " -#~ "the name of the attribute that is" -#~ " equivalent to 'username'" -#~ msgstr "" - -#~ msgid "Set as fork" -#~ msgstr "" - -#~ msgid "Manually set this repository as a fork of another" -#~ msgstr "" - -#~ msgid "Edit file" -#~ msgstr "編輯檔案" -