Mercurial > kallithea
changeset 3691:9b18950fa229 beta
merge with rc1
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 05 Apr 2013 19:21:52 +0200 |
| parents | b20eacde26d5 (current diff) b2332bfb61de (diff) |
| children | 5f9f4ece4b52 |
| files | |
| diffstat | 16 files changed, 13897 insertions(+), 12685 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Fri Apr 05 14:09:23 2013 +0200 +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Fri Apr 05 19:21:52 2013 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-01-28 00:24+0100\n" +"POT-Creation-Date: 2013-04-05 10:19-0700\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL@li.org>\n" @@ -22,11 +22,11 @@ msgstr "" #: rhodecode/controllers/changeset.py:83 -msgid "show white space" +msgid "Show white space" msgstr "" #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 -msgid "ignore white space" +msgid "Ignore white space" msgstr "" #: rhodecode/controllers/changeset.py:163 @@ -35,7 +35,7 @@ msgstr "" #: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:416 +#: rhodecode/controllers/pullrequests.py:438 #, python-format msgid "Status change -> %s" msgstr "" @@ -46,8 +46,8 @@ "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:121 +#: rhodecode/controllers/compare.py:74 +#: rhodecode/controllers/pullrequests.py:167 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "" @@ -89,106 +89,115 @@ msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:137 -#: rhodecode/templates/changeset/changeset.html:149 -#: rhodecode/templates/compare/compare_diff.html:62 -#: rhodecode/templates/compare/compare_diff.html:73 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 -#: rhodecode/templates/pullrequests/pullrequest_show.html:171 +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Changeset was too big and was cut off..." msgstr "" -#: rhodecode/controllers/feed.py:92 -msgid "commited on" -msgstr "" - -#: rhodecode/controllers/files.py:86 -msgid "click here to add new file" -msgstr "" - -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/feed.py:91 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: rhodecode/controllers/files.py:88 +msgid "Click here to add new file" +msgstr "" + +#: rhodecode/controllers/files.py:89 #, python-format msgid "There are no files yet %s" msgstr "" -#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338 +#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:281 +#: rhodecode/controllers/files.py:279 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:295 +#: rhodecode/controllers/files.py:293 #, python-format msgid "Edited file %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:311 +#: rhodecode/controllers/files.py:309 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384 +#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390 +#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:350 +#: rhodecode/controllers/files.py:347 msgid "Added file via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:370 +#: rhodecode/controllers/files.py:364 msgid "No content" msgstr "" -#: rhodecode/controllers/files.py:374 +#: rhodecode/controllers/files.py:368 msgid "No filename" msgstr "" -#: rhodecode/controllers/files.py:416 -msgid "downloads disabled" -msgstr "" - -#: rhodecode/controllers/files.py:427 -#, python-format -msgid "Unknown revision %s" -msgstr "" - -#: rhodecode/controllers/files.py:429 -msgid "Empty repository" +#: rhodecode/controllers/files.py:372 +msgid "Location must be relative path and must not contain .. in path" +msgstr "" + +#: rhodecode/controllers/files.py:420 +msgid "Downloads disabled" msgstr "" #: rhodecode/controllers/files.py:431 +#, python-format +msgid "Unknown revision %s" +msgstr "" + +#: rhodecode/controllers/files.py:433 +msgid "Empty repository" +msgstr "" + +#: rhodecode/controllers/files.py:435 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:576 -#: rhodecode/templates/changeset/changeset_range.html:13 -#: rhodecode/templates/changeset/changeset_range.html:31 +#: rhodecode/controllers/files.py:617 +#: rhodecode/templates/changeset/changeset_range.html:9 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564 +#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 +#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78 -#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575 +#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 +#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:165 +#: rhodecode/controllers/forks.py:175 #, python-format -msgid "forked %s repository as %s" -msgstr "" - -#: rhodecode/controllers/forks.py:179 +msgid "Forked repository %s as %s" +msgstr "" + +#: rhodecode/controllers/forks.py:189 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -198,50 +207,69 @@ msgstr "" #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 -#: rhodecode/templates/base/base.html:238 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "" -#: rhodecode/controllers/login.py:142 -msgid "You have successfully registered into rhodecode" -msgstr "" - -#: rhodecode/controllers/login.py:163 +#: rhodecode/controllers/login.py:138 +msgid "You have successfully registered into RhodeCode" +msgstr "" + +#: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" msgstr "" -#: rhodecode/controllers/login.py:183 +#: rhodecode/controllers/login.py:179 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "" -#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570 +#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/email_templates/changeset_comment.html:15 +msgid "Changeset" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:128 +msgid "Special" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:129 +msgid "Peer branches" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:190 +#: rhodecode/controllers/pullrequests.py:228 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:192 -msgid "error during creation of pull request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:224 +#: rhodecode/controllers/pullrequests.py:230 +msgid "Error creating pull request" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:251 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:227 +#: rhodecode/controllers/pullrequests.py:254 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:260 +#: rhodecode/controllers/pullrequests.py:287 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:451 +#: rhodecode/controllers/pullrequests.py:441 +msgid "Closing with" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:478 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" @@ -257,55 +285,12 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:120 -#: rhodecode/controllers/admin/repos.py:254 -#, python-format -msgid "Repository %s updated successfully" -msgstr "" - -#: rhodecode/controllers/settings.py:138 -#: rhodecode/controllers/admin/repos.py:272 -#, python-format -msgid "error occurred during update of repository %s" -msgstr "" - -#: rhodecode/controllers/settings.py:163 -#: rhodecode/controllers/admin/repos.py:297 -#, python-format -msgid "deleted repository %s" -msgstr "" - -#: rhodecode/controllers/settings.py:167 -#: rhodecode/controllers/admin/repos.py:307 -#: rhodecode/controllers/admin/repos.py:313 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "" - -#: rhodecode/controllers/settings.py:186 -msgid "unlocked" -msgstr "" - -#: rhodecode/controllers/settings.py:189 -msgid "locked" -msgstr "" - -#: rhodecode/controllers/settings.py:191 -#, python-format -msgid "Repository has been %s" -msgstr "" - -#: rhodecode/controllers/settings.py:195 -#: rhodecode/controllers/admin/repos.py:405 -msgid "An error occurred during unlocking" -msgstr "" - -#: rhodecode/controllers/summary.py:140 +#: rhodecode/controllers/summary.py:141 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:144 -#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/controllers/summary.py:147 +#: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "" @@ -314,7 +299,7 @@ msgstr "" #: rhodecode/controllers/admin/defaults.py:110 -msgid "error occurred during update of defaults" +msgid "Error occurred during update of defaults" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:50 @@ -370,7 +355,7 @@ msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:147 -msgid "error occurred during update of ldap settings" +msgid "Error occurred during update of ldap settings" msgstr "" #: rhodecode/controllers/admin/permissions.py:60 @@ -393,43 +378,42 @@ #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 -#: rhodecode/templates/admin/repos/repo_add.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:9 +#: rhodecode/templates/admin/repos/repo_add.html:10 +#: rhodecode/templates/admin/repos/repo_add.html:14 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:133 #: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/admin/users/users.html:85 #: 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:203 -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 +#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:300 msgid "Admin" msgstr "" #: rhodecode/controllers/admin/permissions.py:70 -msgid "disabled" +#: rhodecode/controllers/admin/permissions.py:76 +#: rhodecode/controllers/admin/permissions.py:79 +msgid "Disabled" msgstr "" #: rhodecode/controllers/admin/permissions.py:72 -msgid "allowed with manual account activation" +msgid "Allowed with manual account activation" msgstr "" #: rhodecode/controllers/admin/permissions.py:74 -msgid "allowed with automatic account activation" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:76 -#: rhodecode/controllers/admin/permissions.py:79 -msgid "Disabled" +msgid "Allowed with automatic account activation" msgstr "" #: rhodecode/controllers/admin/permissions.py:77 @@ -442,154 +426,221 @@ msgstr "" #: rhodecode/controllers/admin/permissions.py:142 -msgid "error occurred during update of permissions" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:123 +msgid "Error occurred during update of permissions" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:127 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:162 +#: rhodecode/controllers/admin/repos.py:168 #, python-format -msgid "created repository %s from %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:166 +msgid "Created repository %s from %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:174 #, python-format -msgid "created repository %s" +msgid "Created repository %s" msgstr "" #: rhodecode/controllers/admin/repos.py:197 #, python-format -msgid "error occurred during creation of repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:302 +msgid "Error creating repository %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:266 +#, python-format +msgid "Repository %s updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:284 +#, python-format +msgid "Error occurred during update of repository %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:311 +#: rhodecode/controllers/api/api.py:877 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/api/api.py:879 +#, python-format +msgid "Deleted %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:319 +#, python-format +msgid "Deleted repository %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:322 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:327 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:365 +msgid "Repository permissions updated" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:384 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:350 -msgid "An error occurred during deletion of repository users groups" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:403 +msgid "An error occurred during deletion of repository user groups" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:421 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:438 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:425 +#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:485 +msgid "An error occurred during unlocking" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:476 +msgid "Unlocked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:479 +msgid "Locked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:481 +#, python-format +msgid "Repository has been %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:505 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:509 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301 +#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:527 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:449 +#: rhodecode/controllers/admin/repos.py:529 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:545 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:547 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:471 +#: rhodecode/controllers/admin/repos.py:551 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:136 +#: rhodecode/controllers/admin/repos.py:590 +msgid "An error occurred during creation of field" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:604 +msgid "An error occurred during removal of field" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:145 #, python-format -msgid "created repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:148 +msgid "Created repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:157 #, python-format -msgid "error occurred during creation of repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:205 -#, python-format -msgid "updated repos group %s" +msgid "Error occurred during creation of repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:214 +#: rhodecode/controllers/admin/repos_groups.py:286 +msgid "Cannot revoke permission for yourself as admin" msgstr "" #: rhodecode/controllers/admin/repos_groups.py:220 #, python-format -msgid "error occurred during update of repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:238 +msgid "Updated repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:235 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:253 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:246 +#: rhodecode/controllers/admin/repos_groups.py:260 #, python-format -msgid "removed repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:252 -msgid "Cannot delete this group it still contains subgroups" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:257 -#: rhodecode/controllers/admin/repos_groups.py:262 +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:266 +#, python-format +msgid "Removed repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:271 #, python-format -msgid "error occurred during deletion of repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:283 +msgid "Error occurred during deletion of repos group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:297 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:304 -msgid "An error occurred during deletion of group users groups" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:124 +#: rhodecode/controllers/admin/repos_groups.py:318 +msgid "An error occurred during deletion of group user groups" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:126 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:133 +#: rhodecode/controllers/admin/settings.py:135 msgid "Whoosh reindex task scheduled" msgstr "" -#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:166 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:170 #: rhodecode/controllers/admin/settings.py:301 -msgid "error occurred during updating application settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:209 +msgid "Error occurred during updating application settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:216 msgid "Updated visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:214 -msgid "error occurred during updating visualisation settings" +#: rhodecode/controllers/admin/settings.py:221 +msgid "Error occurred during updating visualisation settings" msgstr "" #: rhodecode/controllers/admin/settings.py:297 @@ -605,35 +656,35 @@ msgstr "" #: rhodecode/controllers/admin/settings.py:327 -msgid "error occurred during hook creation" +msgid "Error occurred during hook creation" msgstr "" #: rhodecode/controllers/admin/settings.py:346 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:408 +#: rhodecode/controllers/admin/settings.py:410 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:448 +#: rhodecode/controllers/admin/settings.py:452 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:463 +#: rhodecode/controllers/admin/settings.py:467 #: rhodecode/controllers/admin/users.py:198 #, python-format -msgid "error occurred during update of user %s" +msgid "Error occurred during update of user %s" msgstr "" #: rhodecode/controllers/admin/users.py:130 #, python-format -msgid "created user %s" +msgid "Created user %s" msgstr "" #: rhodecode/controllers/admin/users.py:142 #, python-format -msgid "error occurred during creation of user %s" +msgid "Error occurred during creation of user %s" msgstr "" #: rhodecode/controllers/admin/users.py:176 @@ -641,7 +692,7 @@ msgstr "" #: rhodecode/controllers/admin/users.py:214 -msgid "successfully deleted user" +msgid "Successfully deleted user" msgstr "" #: rhodecode/controllers/admin/users.py:219 @@ -669,7 +720,7 @@ msgstr "" #: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:279 +#: rhodecode/controllers/admin/users_groups.py:281 msgid "An error occurred during permissions saving" msgstr "" @@ -701,220 +752,219 @@ #: rhodecode/controllers/admin/users_groups.py:86 #, python-format -msgid "created users group %s" +msgid "Created user group %s" msgstr "" #: rhodecode/controllers/admin/users_groups.py:97 #, python-format -msgid "error occurred during creation of users group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:164 +msgid "Error occurred during creation of user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:166 #, python-format -msgid "updated users group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:186 +msgid "Updated user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:188 #, python-format -msgid "error occurred during update of users group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:203 -msgid "successfully deleted users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:208 -msgid "An error occurred during deletion of users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:257 -msgid "Granted 'repository create' permission to users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:262 -msgid "Revoked 'repository create' permission to users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:268 -msgid "Granted 'repository fork' permission to users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:273 -msgid "Revoked 'repository fork' permission to users group" -msgstr "" - -#: rhodecode/lib/auth.py:509 +msgid "Error occurred during update of user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:205 +msgid "Successfully deleted user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:210 +msgid "An error occurred during deletion of user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:259 +msgid "Granted 'repository create' permission to user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:264 +msgid "Revoked 'repository create' permission to user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:270 +msgid "Granted 'repository fork' permission to user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:275 +msgid "Revoked 'repository fork' permission to user group" +msgstr "" + +#: rhodecode/lib/auth.py:530 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:558 +#: rhodecode/lib/auth.py:579 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:599 +#: rhodecode/lib/auth.py:620 msgid "You need to be a signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:74 -msgid "binary file" -msgstr "" - -#: rhodecode/lib/diffs.py:90 +#: rhodecode/lib/diffs.py:66 +msgid "Binary file" +msgstr "" + +#: rhodecode/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:100 +#: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:374 +#: rhodecode/lib/helpers.py:394 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:506 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:509 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:530 +#: rhodecode/lib/helpers.py:547 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/helpers.py:533 +#: rhodecode/lib/helpers.py:550 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:563 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:589 -#, python-format -msgid "Show all combined changesets %s->%s" -msgstr "" - -#: rhodecode/lib/helpers.py:595 -msgid "compare view" -msgstr "" - #: rhodecode/lib/helpers.py:615 -msgid "and" -msgstr "" - -#: rhodecode/lib/helpers.py:616 #, python-format -msgid "%s more" -msgstr "" - -#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 -msgid "revisions" +msgid "Show all combined changesets %s->%s" +msgstr "" + +#: rhodecode/lib/helpers.py:621 +msgid "compare view" msgstr "" #: rhodecode/lib/helpers.py:641 +msgid "and" +msgstr "" + +#: rhodecode/lib/helpers.py:642 +#, python-format +msgid "%s more" +msgstr "" + +#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +msgid "revisions" +msgstr "" + +#: rhodecode/lib/helpers.py:667 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/helpers.py:658 -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 -#, python-format -msgid "Pull request #%s" -msgstr "" - -#: rhodecode/lib/helpers.py:664 -msgid "[deleted] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 -msgid "[created] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:668 -msgid "[created] repository as fork" -msgstr "" - -#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 -msgid "[forked] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 -msgid "[updated] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:674 -msgid "[delete] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:682 -msgid "[created] user" -msgstr "" - #: rhodecode/lib/helpers.py:684 -msgid "[updated] user" -msgstr "" - -#: rhodecode/lib/helpers.py:686 -msgid "[created] users group" -msgstr "" - -#: rhodecode/lib/helpers.py:688 -msgid "[updated] users group" +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#, python-format +msgid "Pull request #%s" msgstr "" #: rhodecode/lib/helpers.py:690 -msgid "[commented] on revision in repository" -msgstr "" - -#: rhodecode/lib/helpers.py:692 -msgid "[commented] on pull request for" +msgid "[deleted] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +msgid "[created] repository" msgstr "" #: rhodecode/lib/helpers.py:694 -msgid "[closed] pull request for" -msgstr "" - -#: rhodecode/lib/helpers.py:696 -msgid "[pushed] into" -msgstr "" - -#: rhodecode/lib/helpers.py:698 -msgid "[committed via RhodeCode] into repository" +msgid "[created] repository as fork" +msgstr "" + +#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +msgid "[forked] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +msgid "[updated] repository" msgstr "" #: rhodecode/lib/helpers.py:700 +msgid "[delete] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:708 +msgid "[created] user" +msgstr "" + +#: rhodecode/lib/helpers.py:710 +msgid "[updated] user" +msgstr "" + +#: rhodecode/lib/helpers.py:712 +msgid "[created] user group" +msgstr "" + +#: rhodecode/lib/helpers.py:714 +msgid "[updated] user group" +msgstr "" + +#: rhodecode/lib/helpers.py:716 +msgid "[commented] on revision in repository" +msgstr "" + +#: rhodecode/lib/helpers.py:718 +msgid "[commented] on pull request for" +msgstr "" + +#: rhodecode/lib/helpers.py:720 +msgid "[closed] pull request for" +msgstr "" + +#: rhodecode/lib/helpers.py:722 +msgid "[pushed] into" +msgstr "" + +#: rhodecode/lib/helpers.py:724 +msgid "[committed via RhodeCode] into repository" +msgstr "" + +#: rhodecode/lib/helpers.py:726 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:728 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:730 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:732 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:884 +#: rhodecode/lib/helpers.py:910 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:888 +#: rhodecode/lib/helpers.py:914 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1164 +#: rhodecode/lib/helpers.py:1198 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -922,185 +972,225 @@ "repositories" msgstr "" -#: rhodecode/lib/utils2.py:403 +#: rhodecode/lib/unionrepo.py:193 +msgid "cannot create new union repository" +msgstr "" + +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:404 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:405 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:406 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:407 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:408 +#: rhodecode/lib/utils2.py:416 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:424 +#: rhodecode/lib/utils2.py:432 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:426 -#, python-format -msgid "%s ago" -msgstr "" - -#: rhodecode/lib/utils2.py:428 -#, python-format -msgid "in %s and %s" -msgstr "" - -#: rhodecode/lib/utils2.py:431 -#, python-format -msgid "%s and %s ago" -msgstr "" - #: rhodecode/lib/utils2.py:434 +#, python-format +msgid "%s ago" +msgstr "" + +#: rhodecode/lib/utils2.py:436 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: rhodecode/lib/utils2.py:439 +#, python-format +msgid "%s and %s ago" +msgstr "" + +#: rhodecode/lib/utils2.py:442 msgid "just now" msgstr "" -#: rhodecode/lib/celerylib/tasks.py:270 -msgid "password reset link" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 msgid "Repository no access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 msgid "Repository read access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 msgid "Repository write access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 msgid "Repository admin access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 msgid "Repositories Group no access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 msgid "Repositories Group read access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 msgid "Repositories Group write access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 msgid "Repositories Group admin access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 msgid "RhodeCode Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 msgid "Repository creation disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 msgid "Repository creation enabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 msgid "Repository forking disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 msgid "Repository forking enabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 msgid "Register disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 msgid "Not Reviewed" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 msgid "Approved" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 msgid "Rejected" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 msgid "Under Review" msgstr "" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:176 +#: rhodecode/model/comment.py:219 msgid "[Mention]" msgstr "" +#: rhodecode/model/db.py:1252 +msgid "top level" +msgstr "" + +#: rhodecode/model/db.py:1393 +msgid "Repository group no access" +msgstr "" + +#: rhodecode/model/db.py:1394 +msgid "Repository group read access" +msgstr "" + +#: rhodecode/model/db.py:1395 +msgid "Repository group write access" +msgstr "" + +#: rhodecode/model/db.py:1396 +msgid "Repository group admin access" +msgstr "" + #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "" @@ -1119,216 +1209,237 @@ msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:220 -#, python-format -msgid "commented on commit at %(when)s" -msgstr "" - -#: rhodecode/model/notification.py:221 -#, python-format -msgid "sent message at %(when)s" -msgstr "" - -#: rhodecode/model/notification.py:222 -#, python-format -msgid "mentioned you at %(when)s" -msgstr "" - -#: rhodecode/model/notification.py:223 -#, python-format -msgid "registered in RhodeCode at %(when)s" -msgstr "" - #: rhodecode/model/notification.py:224 #, python-format -msgid "opened new pull request at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "" #: rhodecode/model/notification.py:225 #, python-format -msgid "commented on pull request at %(when)s" -msgstr "" - -#: rhodecode/model/pull_request.py:100 +msgid "%(user)s sent message at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:226 +#, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:227 +#, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:228 #, python-format -msgid "%(user)s wants you to review pull request #%(pr_id)s" -msgstr "" - -#: rhodecode/model/scm.py:556 +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:229 +#, python-format +msgid "%(user)s commented on pull request at %(when)s" +msgstr "" + +#: rhodecode/model/pull_request.py:104 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" +msgstr "" + +#: rhodecode/model/scm.py:598 msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:231 -msgid "new user registration" -msgstr "" - -#: rhodecode/model/user.py:256 rhodecode/model/user.py:280 +#: rhodecode/model/user.py:232 +msgid "New user registration" +msgstr "" + +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:302 +#: rhodecode/model/user.py:303 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:308 +#: rhodecode/model/user.py:309 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38 +#: rhodecode/model/user.py:334 +msgid "Password reset link" +msgstr "" + +#: rhodecode/model/user.py:366 +msgid "Your new password" +msgstr "" + +#: rhodecode/model/user.py:367 +#, python-format +msgid "Your new RhodeCode password:%s" +msgstr "" + +#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:88 +#: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/validators.py:116 +#: rhodecode/model/validators.py:117 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: rhodecode/model/validators.py:135 -msgid "Invalid users group name" -msgstr "" - #: rhodecode/model/validators.py:136 +msgid "Invalid user group name" +msgstr "" + +#: rhodecode/model/validators.py:137 #, python-format -msgid "Users group \"%(usersgroup)s\" already exists" -msgstr "" - -#: rhodecode/model/validators.py:138 +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + +#: rhodecode/model/validators.py:139 msgid "" -"users group name may only contain alphanumeric characters underscores, " +"user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/validators.py:176 -msgid "Cannot assign this group as parent" -msgstr "" - #: rhodecode/model/validators.py:177 +msgid "Cannot assign this group as parent" +msgstr "" + +#: rhodecode/model/validators.py:178 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:179 +#: rhodecode/model/validators.py:180 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:238 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: rhodecode/model/validators.py:252 +#: rhodecode/model/validators.py:253 msgid "Passwords do not match" msgstr "" -#: rhodecode/model/validators.py:269 -msgid "invalid password" -msgstr "" - #: rhodecode/model/validators.py:270 -msgid "invalid user name" +msgid "invalid password" msgstr "" #: rhodecode/model/validators.py:271 +msgid "invalid user name" +msgstr "" + +#: rhodecode/model/validators.py:272 msgid "Your account is disabled" msgstr "" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: rhodecode/model/validators.py:317 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - #: rhodecode/model/validators.py:318 #, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + +#: rhodecode/model/validators.py:319 +#, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:320 +#: rhodecode/model/validators.py:321 #, python-format -msgid "Repositories group with name \"%(repo)s\" already exists" -msgstr "" - -#: rhodecode/model/validators.py:433 +msgid "Repository group with name \"%(repo)s\" already exists" +msgstr "" + +#: rhodecode/model/validators.py:438 msgid "invalid clone url" msgstr "" -#: rhodecode/model/validators.py:434 +#: rhodecode/model/validators.py:439 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:459 +#: rhodecode/model/validators.py:464 msgid "Fork have to be the same type as parent" msgstr "" -#: rhodecode/model/validators.py:474 +#: rhodecode/model/validators.py:479 msgid "You don't have permissions to create repository in this group" msgstr "" -#: rhodecode/model/validators.py:501 +#: rhodecode/model/validators.py:481 +msgid "no permission to create repository in root location" +msgstr "" + +#: rhodecode/model/validators.py:518 msgid "You don't have permissions to create a group in this location" msgstr "" -#: rhodecode/model/validators.py:540 -msgid "This username or users group name is not valid" -msgstr "" - -#: rhodecode/model/validators.py:636 +#: rhodecode/model/validators.py:557 +msgid "This username or user group name is not valid" +msgstr "" + +#: rhodecode/model/validators.py:650 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:651 +#: rhodecode/model/validators.py:665 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:671 +#: rhodecode/model/validators.py:685 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:708 +#: rhodecode/model/validators.py:722 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: rhodecode/model/validators.py:727 +#: rhodecode/model/validators.py:735 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:759 +#: rhodecode/model/validators.py:767 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:760 +#: rhodecode/model/validators.py:768 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/templates/index.html:3 +#: rhodecode/model/validators.py:800 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "" @@ -1337,222 +1448,226 @@ #: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/bookmarks/bookmarks.html:9 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:9 -#: rhodecode/templates/journal/journal.html:49 -#: rhodecode/templates/journal/journal.html:50 -#: rhodecode/templates/tags/tags.html:10 +#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:47 +#: rhodecode/templates/tags/tags.html:9 msgid "quick filter..." msgstr "" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:239 msgid "repositories" msgstr "" -#: rhodecode/templates/index_base.html:14 -#: rhodecode/templates/index_base.html:17 +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 #: rhodecode/templates/admin/repos/repos.html:21 msgid "Add repository" msgstr "" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/index_base.html:20 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 +msgid "Add group" +msgstr "" + +#: rhodecode/templates/index_base.html:27 msgid "Edit group" msgstr "" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:36 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "Group name" msgstr "" -#: rhodecode/templates/index_base.html:37 -#: rhodecode/templates/index_base.html:79 +#: rhodecode/templates/index_base.html:41 +#: rhodecode/templates/index_base.html:83 #: rhodecode/templates/index_base.html:142 #: rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:270 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:73 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/forks/fork.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.html:47 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 -msgid "Repositories group" -msgstr "" - -#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:51 +#: rhodecode/templates/admin/permissions/permissions.html:55 +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 +#: rhodecode/templates/forks/fork.html:47 +msgid "Repository group" +msgstr "" + +#: rhodecode/templates/index_base.html:82 #: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:271 -#: rhodecode/templates/admin/permissions/permissions.html:117 +#: rhodecode/templates/index_base.html:268 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:71 -#: rhodecode/templates/admin/users/user_edit.html:200 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:211 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 -#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/admin/users/user_edit_my_account.html:172 +#: rhodecode/templates/base/perms_summary.html:14 +#: rhodecode/templates/bookmarks/bookmarks.html:34 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:201 -#: rhodecode/templates/journal/journal.html:305 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:132 -#: rhodecode/templates/tags/tags.html:51 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/summary/summary.html:55 +#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/tags/tags.html:48 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "" -#: rhodecode/templates/index_base.html:80 +#: rhodecode/templates/index_base.html:84 msgid "Last change" msgstr "" -#: rhodecode/templates/index_base.html:81 +#: rhodecode/templates/index_base.html:85 #: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:276 +#: rhodecode/templates/index_base.html:273 #: rhodecode/templates/admin/repos/repos.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:213 -#: rhodecode/templates/journal/journal.html:203 -#: rhodecode/templates/journal/journal.html:307 +#: rhodecode/templates/admin/users/user_edit_my_account.html:174 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:298 msgid "Tip" msgstr "" -#: rhodecode/templates/index_base.html:82 +#: rhodecode/templates/index_base.html:86 #: rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:278 +#: rhodecode/templates/index_base.html:275 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "" - -#: rhodecode/templates/index_base.html:84 +#: rhodecode/templates/index_base.html:87 msgid "Atom" msgstr "" #: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:296 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:235 +#: rhodecode/templates/admin/users/user_edit_my_account.html:196 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:225 -#: rhodecode/templates/journal/journal.html:329 -#: rhodecode/templates/tags/tags.html:77 +#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/branches/branches.html:73 +#: rhodecode/templates/journal/journal.html:217 +#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "" #: rhodecode/templates/index_base.html:172 -#: rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:301 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:297 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:236 +#: rhodecode/templates/admin/users/user_edit_my_account.html:197 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:226 -#: rhodecode/templates/journal/journal.html:330 -#: rhodecode/templates/tags/tags.html:78 +#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/branches/branches.html:74 +#: rhodecode/templates/journal/journal.html:218 +#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "" #: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:274 +#: rhodecode/templates/index_base.html:271 msgid "Last Change" msgstr "" +#: rhodecode/templates/index_base.html:211 +#: rhodecode/templates/admin/repos/repos.html:99 +#: rhodecode/templates/admin/users/user_edit_my_account.html:198 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:219 +#: rhodecode/templates/journal/journal.html:322 +#: rhodecode/templates/tags/tags.html:76 +msgid "No records found." +msgstr "" + +#: rhodecode/templates/index_base.html:212 +#: rhodecode/templates/index_base.html:299 +#: rhodecode/templates/admin/repos/repos.html:100 +#: rhodecode/templates/admin/users/user_edit_my_account.html:199 +#: rhodecode/templates/admin/users/users.html:110 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:220 +#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/tags/tags.html:77 +msgid "Data error." +msgstr "" + #: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:302 -#: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:237 -#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +#: rhodecode/templates/admin/users/user_edit_my_account.html:200 +#: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:227 -#: rhodecode/templates/journal/journal.html:331 -#: rhodecode/templates/tags/tags.html:79 -msgid "No records found." -msgstr "" - -#: rhodecode/templates/index_base.html:214 -#: rhodecode/templates/index_base.html:303 -#: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:238 -#: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:228 -#: rhodecode/templates/journal/journal.html:332 -#: rhodecode/templates/tags/tags.html:80 -msgid "Data error." -msgstr "" - -#: rhodecode/templates/index_base.html:215 -#: rhodecode/templates/index_base.html:304 -#: rhodecode/templates/admin/repos/repos.html:101 -#: rhodecode/templates/admin/users/user_edit_my_account.html:105 -#: rhodecode/templates/admin/users/user_edit_my_account.html:239 -#: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:229 -#: rhodecode/templates/journal/journal.html:333 -#: rhodecode/templates/tags/tags.html:81 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:221 +#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "" -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 -msgid "Sign In" +#: rhodecode/templates/index_base.html:298 +msgid "No repositories found." +msgstr "" + +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +msgid "Log In" msgstr "" #: rhodecode/templates/login.html:21 -msgid "Sign In to" +#, python-format +msgid "Log In to %s" msgstr "" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:54 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:89 -#: rhodecode/templates/summary/summary.html:131 +#: rhodecode/templates/admin/users/user_edit.html:57 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 +#: rhodecode/templates/admin/users/users.html:77 +#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "" #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:98 +#: rhodecode/templates/base/base.html:212 msgid "Password" msgstr "" @@ -1560,16 +1675,20 @@ msgid "Remember me" msgstr "" +#: rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 msgid "Don't have an account ?" msgstr "" #: rhodecode/templates/password_reset.html:5 -msgid "Reset your password" +msgid "Password Reset" msgstr "" #: rhodecode/templates/password_reset.html:11 @@ -1602,23 +1721,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57 +#: rhodecode/templates/admin/users/user_edit.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "First Name" msgstr "" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:103 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66 +#: rhodecode/templates/admin/users/user_edit.html:106 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 msgid "Last Name" msgstr "" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75 -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/admin/users/user_edit.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/summary/summary.html:125 msgid "Email" msgstr "" @@ -1630,44 +1749,31 @@ msgid "Your account must wait for activation by administrator" msgstr "" -#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:76 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/summary/summary.html:77 msgid "Private repository" msgstr "" -#: rhodecode/templates/repo_switcher_list.html:16 +#: rhodecode/templates/repo_switcher_list.html:12 +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/summary/summary.html:79 msgid "Public repository" msgstr "" -#: rhodecode/templates/switch_to_list.html:3 -#: rhodecode/templates/branches/branches.html:14 -msgid "branches" -msgstr "" - #: rhodecode/templates/switch_to_list.html:10 #: rhodecode/templates/branches/branches_data.html:57 msgid "There are no branches yet" msgstr "" -#: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:15 -msgid "tags" -msgstr "" - #: rhodecode/templates/switch_to_list.html:22 #: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "" -#: rhodecode/templates/switch_to_list.html:28 -#: rhodecode/templates/bookmarks/bookmarks.html:15 -msgid "bookmarks" -msgstr "" - #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 msgid "There are no bookmarks yet" @@ -1675,6 +1781,7 @@ #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/base/base.html:68 msgid "Admin journal" msgstr "" @@ -1697,9 +1804,12 @@ #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account.html:215 -#: rhodecode/templates/journal/journal.html:205 -#: rhodecode/templates/journal/journal.html:309 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:87 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:300 msgid "Action" msgstr "" @@ -1709,11 +1819,11 @@ msgstr "" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/tags/tags.html:52 +#: rhodecode/templates/tags/tags.html:49 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "" @@ -1732,6 +1842,7 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:11 +#: rhodecode/templates/base/base.html:75 msgid "Defaults" msgstr "" @@ -1744,8 +1855,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 +#: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1773,7 +1883,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 msgid "Enable locking" msgstr "" @@ -1785,14 +1895,17 @@ #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 #: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:148 +#: rhodecode/templates/admin/repos/repo_edit.html:173 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:137 -#: rhodecode/templates/admin/users/user_edit.html:182 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users/user_edit.html:140 +#: rhodecode/templates/admin/users/user_edit.html:185 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "" @@ -1801,7 +1914,9 @@ msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:11 -msgid "Ldap" +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:74 +msgid "LDAP" msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:28 @@ -1883,8 +1998,7 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 msgid "Pull requests" msgstr "" @@ -1902,6 +2016,7 @@ msgstr "" #: rhodecode/templates/admin/notifications/show_notification.html:9 +#: rhodecode/templates/base/base.html:241 msgid "Notifications" msgstr "" @@ -1910,11 +2025,12 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63 -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:165 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/users/user_edit.html:150 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:86 +#: rhodecode/templates/base/base.html:73 msgid "Permissions" msgstr "" @@ -1928,30 +2044,21 @@ #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" -"All default permissions on each repository will be reset to choosen " +"All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -msgid "overwrite existing settings" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:55 -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" +msgid "Overwrite existing settings" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:62 msgid "" -"All default permissions on each repository group will be reset to choosen" -" permission, note that all custom default permission on repositories " -"group will be lost" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 @@ -1967,22 +2074,23 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:209 -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:179 -#: rhodecode/templates/admin/settings/settings.html:269 -#: rhodecode/templates/admin/users/user_edit.html:138 -#: rhodecode/templates/admin/users/user_edit.html:183 -#: rhodecode/templates/admin/users/user_edit.html:286 -#: rhodecode/templates/admin/users/user_edit.html:334 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84 +#: rhodecode/templates/admin/permissions/permissions.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:149 +#: rhodecode/templates/admin/repos/repo_edit.html:174 +#: rhodecode/templates/admin/repos/repo_edit.html:388 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:278 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users/user_edit.html:283 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:95 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:110 msgid "Reset" msgstr "" @@ -1990,104 +2098,70 @@ msgid "Default User Permissions" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:111 -#: rhodecode/templates/admin/users/user_edit.html:194 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -msgid "Nothing here yet" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:118 -#: rhodecode/templates/admin/users/user_edit.html:201 -#: rhodecode/templates/admin/users/user_edit_my_account.html:61 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 -msgid "Permission" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:119 -#: rhodecode/templates/admin/users/user_edit.html:202 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 -msgid "Edit Permission" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:149 -#: rhodecode/templates/admin/permissions/permissions.html:151 -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:232 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:116 -#: rhodecode/templates/data_table/_dt_elements.html:117 -msgid "edit" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:168 -#: rhodecode/templates/admin/users/user_edit.html:295 +#: rhodecode/templates/admin/permissions/permissions.html:113 +#: rhodecode/templates/admin/users/user_edit.html:244 msgid "Allowed IP addresses" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:182 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 -#: rhodecode/templates/admin/users/user_edit.html:263 -#: rhodecode/templates/admin/users/user_edit.html:308 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/admin/permissions/permissions.html:127 +#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 +#: rhodecode/templates/admin/users/user_edit.html:212 +#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users_groups/users_groups.html:46 #: rhodecode/templates/data_table/_dt_elements.html:122 #: rhodecode/templates/data_table/_dt_elements.html:130 msgid "delete" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:183 -#: rhodecode/templates/admin/users/user_edit.html:309 +#: rhodecode/templates/admin/permissions/permissions.html:128 +#: rhodecode/templates/admin/users/user_edit.html:258 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:189 -#: rhodecode/templates/admin/users/user_edit.html:315 +#: rhodecode/templates/admin/permissions/permissions.html:134 +#: rhodecode/templates/admin/users/user_edit.html:264 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:200 -#: rhodecode/templates/admin/users/user_edit.html:326 +#: rhodecode/templates/admin/permissions/permissions.html:145 +#: rhodecode/templates/admin/users/user_edit.html:275 msgid "New ip address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:208 -#: rhodecode/templates/admin/users/user_edit.html:285 -#: rhodecode/templates/admin/users/user_edit.html:333 +#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:387 +#: rhodecode/templates/admin/users/user_edit.html:234 +#: rhodecode/templates/admin/users/user_edit.html:282 msgid "Add" msgstr "" -#: rhodecode/templates/admin/repos/repo_add.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -#: rhodecode/templates/base/base.html:154 +#: rhodecode/templates/admin/repos/repo_add.html:12 +#: rhodecode/templates/admin/repos/repo_add.html:16 +#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 +#: rhodecode/templates/base/base.html:263 msgid "Repositories" msgstr "" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +#: rhodecode/templates/admin/repos/repo_add.html:19 +msgid "Add new" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:104 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Clone from" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:24 #: rhodecode/templates/admin/repos/repo_edit.html:44 -#: rhodecode/templates/settings/repo_settings.html:43 msgid "Optional http[s] url from which repository should be cloned." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/forks/fork.html:54 +#: rhodecode/templates/forks/fork.html:51 msgid "Optionaly select a group to put this repository into." msgstr "" @@ -2097,44 +2171,39 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 -#: rhodecode/templates/forks/fork.html:41 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/forks/fork.html:38 msgid "Landing revision" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 -#: rhodecode/templates/forks/fork.html:45 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 -#: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:70 +#: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -msgid "add" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 -msgid "add new repository" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:5 +#: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:12 +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:11 +#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/summary/summary.html:212 +msgid "Settings" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:40 -#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 msgid "Optional select a group to put this repository into." msgstr "" @@ -2142,162 +2211,204 @@ msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:152 -msgid "Administration" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:155 +#: rhodecode/templates/admin/repos/repo_edit.html:184 +msgid "Advanced settings" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Reset current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Confirm to remove current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:195 msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:171 -msgid "Remote" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:175 -msgid "Pull changes from remote location" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:175 -msgid "Confirm to pull changes from remote side" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:186 -msgid "Cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:190 -msgid "Invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:190 -msgid "Confirm to invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:193 -msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:198 -msgid "List of cached values" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Prefix" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:202 -msgid "Key" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:203 -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:121 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" +msgid "Remote" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:207 +msgid "Pull changes from remote location" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:207 +msgid "Confirm to pull changes from remote side" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:306 -#: rhodecode/templates/base/base.html:308 -#: rhodecode/templates/base/base.html:310 +msgid "Cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Confirm to invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:225 +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:230 +msgid "List of cached values" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:233 +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:234 +msgid "Key" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:124 +#: rhodecode/templates/admin/users/users.html:84 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +#: rhodecode/templates/admin/users_groups/users_groups.html:36 +msgid "Active" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:250 +#: rhodecode/templates/base/base.html:280 +#: rhodecode/templates/base/base.html:281 msgid "Public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "Remove from public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:226 +#: rhodecode/templates/admin/repos/repo_edit.html:258 msgid "Add to public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:231 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:238 +#: rhodecode/templates/admin/repos/repo_edit.html:270 msgid "Locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Confirm to unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:246 -msgid "Confirm to lock repository" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:247 -msgid "Repository is not locked" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:252 -msgid "Force locking on repository. Works only when anonymous access is disabled" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:259 -msgid "Set as fork of" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:264 -msgid "set" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:268 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:274 -#: rhodecode/templates/changeset/changeset_file_comment.html:41 -msgid "Delete" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +msgid "Confirm to lock repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:279 +msgid "Repository is not locked" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:284 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:291 +msgid "Set as fork of" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:296 +msgid "set" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:300 +msgid "Manually set this repository as a fork of another from the list" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:306 +#: rhodecode/templates/changeset/changeset_file_comment.html:41 +msgid "Delete" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Remove this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Confirm to delete this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:282 -#: rhodecode/templates/settings/repo_settings.html:119 +#: rhodecode/templates/admin/repos/repo_edit.html:317 +#, python-format +msgid "this repository has %s fork" +msgid_plural "this repository has %s forks" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/admin/repos/repo_edit.html:318 +msgid "Detach forks" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:319 +msgid "Delete forks" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:322 msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need fully delete it " -"from file system please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" +" from file system please do it manually" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:336 +msgid "Extra fields" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:348 +#, fuzzy, python-format +msgid "Confirm to delete this field: %s" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:362 +msgid "New field key" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgid "New field label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:373 +msgid "Enter short label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:379 +msgid "New field description" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgid "Enter description of a field" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 @@ -2317,8 +2428,6 @@ #: 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:85 -#: rhodecode/templates/base/base.html:235 msgid "admin" msgstr "" @@ -2328,74 +2437,58 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 -#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:19 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 msgid "default" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 msgid "revoke" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 msgid "Add another member" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 msgid "Failed to remove user" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 -msgid "Failed to remove users group" +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 +msgid "Failed to remove user group" msgstr "" #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 msgid "apply to children" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" msgstr "" +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#, python-format +msgid "%s Group Dashboard" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 -#: rhodecode/templates/base/base.html:128 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 msgid "Home" msgstr "" @@ -2404,76 +2497,78 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repos group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 -msgid "Repos groups" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 -msgid "add new repos group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55 +msgid "Add repository group" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 +#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 +msgid "Repository groups" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 +msgid "Add new repository group" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 msgid "Group parent" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/users/user_add.html:94 -#: rhodecode/templates/admin/users_groups/users_group_add.html:49 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:149 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59 msgid "save" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repos group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 -msgid "edit repos group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26 -msgid "Add new child group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 +msgid "Edit repository group" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 +#, python-format +msgid "Edit repository group %s" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 +msgid "Add child group" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repositories groups administration" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -msgid "Add new group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +msgid "Repository groups administration" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +msgid "Edit" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/base/perms_summary.html:29 +#: rhodecode/templates/base/perms_summary.html:48 +#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/data_table/_dt_elements.html:116 +#: rhodecode/templates/data_table/_dt_elements.html:117 +msgid "edit" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68 -msgid "There are no repositories groups yet" +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 +msgid "There are no repository groups yet" msgstr "" #: rhodecode/templates/admin/settings/hooks.html:5 @@ -2481,12 +2576,6 @@ msgid "Settings administration" msgstr "" -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:13 -msgid "Settings" -msgstr "" - #: rhodecode/templates/admin/settings/hooks.html:24 msgid "Built in hooks - read only" msgstr "" @@ -2503,205 +2592,210 @@ msgid "Failed to remove hook" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:24 +#: rhodecode/templates/admin/settings/settings.html:26 msgid "Remap and rescan repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:32 -msgid "rescan option" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:38 +#: rhodecode/templates/admin/settings/settings.html:34 +msgid "Rescan option" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:40 msgid "" "In case a repository was deleted from filesystem and there are leftovers " "in the database check this option to scan obsolete data in database and " "remove it." msgstr "" -#: rhodecode/templates/admin/settings/settings.html:39 -msgid "destroy old data" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:41 +msgid "Destroy old data" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:43 msgid "" "Rescan repositories location for new repositories. Also deletes obsolete " "if `destroy` flag is checked " msgstr "" -#: rhodecode/templates/admin/settings/settings.html:46 +#: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:52 +#: rhodecode/templates/admin/settings/settings.html:54 msgid "Whoosh indexing" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:60 -msgid "index build option" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:65 -msgid "build from scratch" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:71 +#: rhodecode/templates/admin/settings/settings.html:62 +msgid "Index build option" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:67 +msgid "Build from scratch" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:77 +#: rhodecode/templates/admin/settings/settings.html:79 msgid "Global application settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:86 -msgid "Application name" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:95 -msgid "Realm text" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:104 -msgid "GA code" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/settings/settings.html:268 +#: rhodecode/templates/admin/settings/settings.html:88 +msgid "Site branding" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:97 +msgid "HTTP authentication realm" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:106 +msgid "Google Analytics code" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:114 +#: rhodecode/templates/admin/settings/settings.html:186 +#: rhodecode/templates/admin/settings/settings.html:277 msgid "Save settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:119 +#: rhodecode/templates/admin/settings/settings.html:121 msgid "Visualisation settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:129 msgid "General" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:132 +#: rhodecode/templates/admin/settings/settings.html:134 msgid "Use lightweight dashboard" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:140 +msgid "Use repository extra fields" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:147 msgid "Icons" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:156 msgid "Show private repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:163 msgid "Meta-Tagging" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:168 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:195 msgid "VCS settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:201 -msgid "require ssl for vcs operations" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:209 +msgid "Require SSL for vcs operations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:211 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:217 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:214 -msgid "Update repository after push (hg update)" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:218 -msgid "Show repository size after push" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:222 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: rhodecode/templates/admin/settings/settings.html:226 -msgid "Log user pull commands" +msgid "Show repository size after push" msgstr "" #: rhodecode/templates/admin/settings/settings.html:230 -msgid "advanced setup" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:235 +msgid "Log user push commands" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:234 +msgid "Log user pull commands" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:238 +msgid "Advanced setup" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Mercurial Extensions" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:240 -msgid "largefiles extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:244 -msgid "hgsubversion extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:246 +#: rhodecode/templates/admin/settings/settings.html:248 +msgid "Enable largefiles extension" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:252 +msgid "Enable hgsubversion extension" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:254 msgid "" -"Requires hgsubversion library installed. Allows clonning from svn remote " +"Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:256 +#: rhodecode/templates/admin/settings/settings.html:264 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:261 +#: rhodecode/templates/admin/settings/settings.html:269 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "" -#: rhodecode/templates/admin/settings/settings.html:262 -#: rhodecode/templates/base/base.html:227 -msgid "unlock" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:263 +#: rhodecode/templates/admin/settings/settings.html:270 +#: rhodecode/templates/base/base.html:131 +msgid "Unlock" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:272 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:283 +#: rhodecode/templates/admin/settings/settings.html:292 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:291 +#: rhodecode/templates/admin/settings/settings.html:300 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:299 -msgid "Send" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:305 -msgid "System Info and Packages" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:308 -msgid "show" +msgid "Send" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:314 +msgid "System Info and Packages" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:317 +#: rhodecode/templates/changelog/changelog.html:42 +msgid "Show" msgstr "" #: rhodecode/templates/admin/users/user_add.html:5 @@ -2710,11 +2804,13 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 +#: rhodecode/templates/base/base.html:71 msgid "Users" msgstr "" #: rhodecode/templates/admin/users/user_add.html:12 -msgid "add new user" +#: rhodecode/templates/admin/users/users.html:23 +msgid "Add new user" msgstr "" #: rhodecode/templates/admin/users/user_add.html:50 @@ -2725,6 +2821,12 @@ msgid "Edit user" msgstr "" +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#, python-format +msgid "Edit %s" +msgstr "" + #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 msgid "Change your avatar at" @@ -2740,30 +2842,31 @@ msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:48 -msgid "Your IP" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit.html:67 +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 +msgid "Current IP" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:76 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39 +#: rhodecode/templates/admin/users/user_edit.html:79 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:85 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48 +#: rhodecode/templates/admin/users/user_edit.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "New password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:158 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:160 +#: rhodecode/templates/admin/users/user_edit.html:163 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2771,31 +2874,31 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:169 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:177 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:251 +#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/users/user_edit.html:213 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "New email address" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:130 +#: rhodecode/templates/base/base.html:242 msgid "My account" msgstr "" @@ -2808,7 +2911,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:57 +#: rhodecode/templates/journal/journal.html:54 msgid "My repos" msgstr "" @@ -2816,30 +2919,43 @@ msgid "My pull requests" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/journal/journal.html:61 -msgid "Add repo" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 +msgid "Show closed pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 +#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_show.html:27 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +msgid "Closed" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 msgid "Confirm to delete this pull request" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 +msgid "Nothing here yet" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "" @@ -2849,67 +2965,51 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:241 msgid "users" msgstr "" -#: rhodecode/templates/admin/users/users.html:23 -msgid "Add new user" -msgstr "" - -#: rhodecode/templates/admin/users/users.html:77 -msgid "username" -msgstr "" - #: rhodecode/templates/admin/users/users.html:80 -msgid "firstname" +msgid "Firstname" msgstr "" #: rhodecode/templates/admin/users/users.html:81 -msgid "lastname" +msgid "Lastname" msgstr "" #: rhodecode/templates/admin/users/users.html:82 -msgid "last login" -msgstr "" - -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" -msgstr "" - -#: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:244 -msgid "ldap" +msgid "Last login" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -msgid "Add users group" +msgid "Add user group" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -msgid "Users groups" +#: rhodecode/templates/admin/users_groups/users_groups.html:11 +#: rhodecode/templates/base/base.html:72 +msgid "User groups" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -msgid "add new users group" +#: rhodecode/templates/admin/users_groups/users_groups.html:25 +msgid "Add new user group" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit users group" +msgid "Edit user group" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -msgid "UsersGroups" +msgid "UserGroups" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "Members" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -msgid "Choosen group members" +msgid "Chosen group members" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 @@ -2924,260 +3024,245 @@ msgid "Add all elements" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 msgid "Group members" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 msgid "No members yet" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 -msgid "Permissions defined for this group" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 -msgid "No permissions set yet" -msgstr "" - #: rhodecode/templates/admin/users_groups/users_groups.html:5 -msgid "Users groups administration" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_groups.html:23 -msgid "Add new user group" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_groups.html:32 -msgid "group name" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -#: rhodecode/templates/base/root.html:46 -msgid "members" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_groups.html:45 -#, python-format -msgid "Confirm to delete this users group: %s" -msgstr "" - -#: rhodecode/templates/base/base.html:41 +msgid "User groups administration" +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#, fuzzy, python-format +msgid "Confirm to delete this user group: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:42 msgid "Submit a bug" msgstr "" -#: rhodecode/templates/base/base.html:76 -msgid "Not logged in" -msgstr "" - -#: rhodecode/templates/base/base.html:83 -msgid "Login to your account" -msgstr "" - -#: rhodecode/templates/base/base.html:106 -msgid "Forgot password ?" -msgstr "" - -#: rhodecode/templates/base/base.html:113 -msgid "Log In" -msgstr "" - -#: rhodecode/templates/base/base.html:124 -msgid "Inbox" -msgstr "" - -#: rhodecode/templates/base/base.html:129 -#: rhodecode/templates/base/base.html:297 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:301 -#: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/public_journal.html:4 -msgid "Journal" -msgstr "" - -#: rhodecode/templates/base/base.html:131 -msgid "Log Out" -msgstr "" - -#: rhodecode/templates/base/base.html:150 -msgid "Switch repository" -msgstr "" - -#: rhodecode/templates/base/base.html:152 -msgid "Products" -msgstr "" - -#: rhodecode/templates/base/base.html:158 -#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47 -msgid "loading..." -msgstr "" - -#: rhodecode/templates/base/base.html:166 -#: rhodecode/templates/base/base.html:168 -#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/base/base.html:108 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 +#: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: rhodecode/templates/base/base.html:174 -#: rhodecode/templates/base/base.html:176 -#: rhodecode/templates/base/base.html:178 -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/base/base.html:109 +#: rhodecode/templates/changelog/changelog.html:11 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "" -#: rhodecode/templates/base/base.html:182 -#: rhodecode/templates/base/base.html:184 -#: rhodecode/templates/base/base.html:186 -msgid "Switch to" -msgstr "" - -#: rhodecode/templates/base/base.html:193 -#: rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:110 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:12 msgid "Files" msgstr "" -#: rhodecode/templates/base/base.html:201 -#: rhodecode/templates/base/base.html:205 +#: rhodecode/templates/base/base.html:112 +msgid "Switch To" +msgstr "" + +#: rhodecode/templates/base/base.html:114 +#: rhodecode/templates/base/base.html:267 +msgid "loading..." +msgstr "" + +#: rhodecode/templates/base/base.html:118 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/base/base.html:212 -msgid "repository settings" -msgstr "" - -#: rhodecode/templates/base/base.html:216 +#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/base/base.html:126 +msgid "Lightweight changelog" +msgstr "" + +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:54 +msgid "Search" +msgstr "" + +#: rhodecode/templates/base/base.html:133 +msgid "Lock" +msgstr "" + +#: rhodecode/templates/base/base.html:141 +msgid "Follow" +msgstr "" + +#: rhodecode/templates/base/base.html:142 +msgid "Unfollow" +msgstr "" + +#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/forks/fork.html:13 -msgid "fork" -msgstr "" - -#: rhodecode/templates/base/base.html:218 -#: rhodecode/templates/changelog/changelog.html:43 -msgid "open new pull request" -msgstr "" - -#: rhodecode/templates/base/base.html:221 -msgid "compare fork" -msgstr "" - -#: rhodecode/templates/base/base.html:223 -msgid "search" -msgstr "" - -#: rhodecode/templates/base/base.html:229 -msgid "lock" -msgstr "" - -#: rhodecode/templates/base/base.html:240 -msgid "repositories groups" -msgstr "" - -#: rhodecode/templates/base/base.html:242 -msgid "users groups" +#: rhodecode/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: rhodecode/templates/base/base.html:147 +msgid "Create Pull Request" +msgstr "" + +#: rhodecode/templates/base/base.html:153 +msgid "Show Pull Requests" +msgstr "" + +#: rhodecode/templates/base/base.html:153 +msgid "Pull Requests" +msgstr "" + +#: rhodecode/templates/base/base.html:190 +msgid "Not logged in" +msgstr "" + +#: rhodecode/templates/base/base.html:197 +msgid "Login to your account" +msgstr "" + +#: rhodecode/templates/base/base.html:220 +msgid "Forgot password ?" msgstr "" #: rhodecode/templates/base/base.html:243 -msgid "permissions" -msgstr "" - -#: rhodecode/templates/base/base.html:245 -msgid "defaults" -msgstr "" - -#: rhodecode/templates/base/base.html:246 -msgid "settings" -msgstr "" - -#: rhodecode/templates/base/base.html:256 -#: rhodecode/templates/base/base.html:258 -msgid "Followers" -msgstr "" - -#: rhodecode/templates/base/base.html:264 -#: rhodecode/templates/base/base.html:266 -msgid "Forks" -msgstr "" - -#: rhodecode/templates/base/base.html:315 -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 -#: rhodecode/templates/search/search.html:52 -msgid "Search" -msgstr "" - -#: rhodecode/templates/base/root.html:42 -msgid "add another comment" +msgid "Log Out" +msgstr "" + +#: rhodecode/templates/base/base.html:262 +msgid "Switch repository" +msgstr "" + +#: rhodecode/templates/base/base.html:274 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "" + +#: rhodecode/templates/base/base.html:286 +msgid "Search in repositories" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:8 +msgid "No permissions defined yet" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:15 +msgid "Permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:16 +msgid "Edit Permission" msgstr "" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/data_table/_dt_elements.html:140 -#: rhodecode/templates/summary/summary.html:57 -msgid "Stop following this repository" +#, fuzzy +msgid "Add another comment" msgstr "" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:61 -msgid "Start following this repository" +#: rhodecode/templates/data_table/_dt_elements.html:140 +msgid "Stop following this repository" msgstr "" #: rhodecode/templates/base/root.html:45 +msgid "Start following this repository" +msgstr "" + +#: rhodecode/templates/base/root.html:46 msgid "Group" msgstr "" +#: rhodecode/templates/base/root.html:47 +msgid "members" +msgstr "" + #: rhodecode/templates/base/root.html:48 -msgid "search truncated" +#: rhodecode/templates/pullrequests/pullrequest.html:181 +msgid "Loading ..." msgstr "" #: rhodecode/templates/base/root.html:49 -msgid "no matching files" +msgid "Search truncated" msgstr "" #: rhodecode/templates/base/root.html:50 -msgid "Open new pull request" +msgid "No matching files" msgstr "" #: rhodecode/templates/base/root.html:51 -msgid "Open new pull request for selected changesets" +#: rhodecode/templates/changelog/changelog.html:36 +msgid "Open new pull request" msgstr "" #: rhodecode/templates/base/root.html:52 -msgid "Show selected changes __S -> __E" +msgid "Open new pull request for selected changesets" msgstr "" #: rhodecode/templates/base/root.html:53 +msgid "Show selected changesets __S -> __E" +msgstr "" + +#: rhodecode/templates/base/root.html:54 +msgid "Show selected changeset __S" +msgstr "" + +#: rhodecode/templates/base/root.html:55 msgid "Selection link" msgstr "" +#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/changeset/diff_block.html:8 +msgid "Collapse diff" +msgstr "" + +#: rhodecode/templates/base/root.html:57 +msgid "Expand diff" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks.html:38 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/tags/tags.html:55 +#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "" @@ -3187,15 +3272,13 @@ msgid "%s Branches" msgstr "" -#: rhodecode/templates/branches/branches.html:29 +#: rhodecode/templates/branches/branches.html:26 msgid "Compare branches" msgstr "" -#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches.html:53 #: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/compare/compare_diff.html:5 -#: rhodecode/templates/compare/compare_diff.html:13 -#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "" @@ -3205,116 +3288,80 @@ msgid "%s Changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/changelog/changelog.html:11 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/changelog/changelog.html:30 msgid "Clear selection" msgstr "" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 #: rhodecode/templates/forks/forks_data.html:19 #, python-format -msgid "compare fork with %s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:40 +msgid "Compare fork with %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:33 msgid "Compare fork with parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:49 -msgid "Show" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:74 -#: rhodecode/templates/summary/summary.html:375 -msgid "show more" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:78 -msgid "Affected number of files, click to show more details" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:65 -#: rhodecode/templates/changeset/changeset_file_comment.html:20 -#: rhodecode/templates/changeset/changeset_range.html:46 -msgid "Changeset status" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:94 -#: rhodecode/templates/shortlog/shortlog_data.html:20 +#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/summary/summary.html:404 +msgid "Show more" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changeset/changeset_range.html:86 #, python-format -msgid "Click to open associated pull request #%s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:104 -msgid "Parent" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:42 -msgid "No parents" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:115 +msgid "Bookmark %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:95 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset_range.html:92 +#, python-format +msgid "Tag %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:100 #: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:79 -msgid "merge" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:109 -#: rhodecode/templates/changeset/changeset_range.html:82 -#: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_add.html:33 -#: rhodecode/templates/files/files_edit.html:33 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -msgid "branch" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:124 -#: rhodecode/templates/changeset/changeset_range.html:88 -msgid "bookmark" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:114 -#: rhodecode/templates/changeset/changeset_range.html:94 -msgid "tag" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:302 +#: rhodecode/templates/changeset/changeset_range.html:80 +#, python-format +msgid "Branch %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:258 msgid "There are no changes yet" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:94 -msgid "removed" +#: rhodecode/templates/changeset/changeset.html:91 +msgid "Removed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:95 -msgid "changed" +#: rhodecode/templates/changeset/changeset.html:92 +#, fuzzy +msgid "Changed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:96 -msgid "added" +#: rhodecode/templates/changeset/changeset.html:93 +msgid "Added" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:98 -#: rhodecode/templates/changeset/changeset.html:99 -#: rhodecode/templates/changeset/changeset.html:100 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changeset/changeset.html:97 #, python-format -msgid "affected %s files" +msgid "Affected %s files" msgstr "" #: rhodecode/templates/changeset/changeset.html:6 @@ -3322,29 +3369,35 @@ msgid "%s Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:14 -msgid "Changeset" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:52 +#: rhodecode/templates/changeset/changeset.html:39 +msgid "No parents" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:49 msgid "No children" msgstr "" -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/diff_block.html:20 -msgid "raw diff" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:71 -msgid "patch diff" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:72 -#: rhodecode/templates/changeset/diff_block.html:21 -msgid "download diff" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:62 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:44 +msgid "Changeset status" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/diff_block.html:23 +msgid "Raw diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:68 +msgid "Patch diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:69 +#: rhodecode/templates/changeset/diff_block.html:24 +msgid "Download diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "%d comment" @@ -3352,7 +3405,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "(%d inline)" @@ -3360,32 +3413,53 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:122 -#: rhodecode/templates/compare/compare_diff.html:44 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:77 +msgid "merge" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/compare/compare_diff.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:124 -#: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/pullrequests/pullrequest_show.html:96 +#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/compare/compare_diff.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Showing a huge diff might take some time and resources" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Show full diff" +msgstr "" + #: rhodecode/templates/changeset/changeset_file_comment.html:30 #, python-format -msgid "Status from pull request %s" +msgid "Status change on pull request #%s" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:32 #, python-format -msgid "Comment from pull request %s" +msgid "Comment on pull request #%s" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:57 @@ -3397,24 +3471,23 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:139 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:142 +#: rhodecode/templates/changeset/changeset_file_comment.html:141 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:162 +#: rhodecode/templates/changeset/changeset_file_comment.html:161 msgid "Comment" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:75 -#: rhodecode/templates/changeset/changeset_file_comment.html:86 -msgid "Hide" +msgid "Cancel" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:82 @@ -3425,19 +3498,15 @@ msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:137 -msgid "Leave a comment" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "Check this to change current status of code-review for this changeset" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "change status" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:164 +#: rhodecode/templates/changeset/changeset_file_comment.html:86 +msgid "Hide" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:143 +msgid "Change status" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:163 msgid "Comment and close" msgstr "" @@ -3446,69 +3515,74 @@ msgid "%s Changesets" msgstr "" -#: rhodecode/templates/changeset/changeset_range.html:29 -#: rhodecode/templates/compare/compare_diff.html:29 -msgid "Compare View" -msgstr "" - -#: rhodecode/templates/changeset/changeset_range.html:29 -msgid "Show combined compare" -msgstr "" - -#: rhodecode/templates/changeset/changeset_range.html:54 +#: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:19 -msgid "show full diff for this file" -msgstr "" - -#: rhodecode/templates/changeset/diff_block.html:27 -msgid "show inline comments" -msgstr "" - -#: rhodecode/templates/compare/compare_cs.html:5 +#: rhodecode/templates/changeset/diff_block.html:22 +msgid "Show full diff for this file" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:30 +msgid "Show inline comments" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:55 +msgid "Show file at latest version in this repo" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:56 +msgid "Show file at initial version in this repo" +msgstr "" + +#: rhodecode/templates/compare/compare_cs.html:4 msgid "No changesets" msgstr "" -#: rhodecode/templates/compare/compare_diff.html:37 -#: rhodecode/templates/pullrequests/pullrequest_show.html:87 +#: rhodecode/templates/compare/compare_cs.html:32 +msgid "Ancestor" +msgstr "" + +#: rhodecode/templates/compare/compare_diff.html:5 +#, fuzzy, python-format +msgid "%s Compare" +msgstr "" + +#: rhodecode/templates/compare/compare_diff.html:9 +msgid "Compare revisions" +msgstr "" + +#: rhodecode/templates/compare/compare_diff.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:106 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/compare/compare_diff.html:52 -#: rhodecode/templates/pullrequests/pullrequest_show.html:102 +#: rhodecode/templates/compare/compare_diff.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:121 msgid "No files" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 -msgid "Fork" +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +msgid "confirm to show potentially huge diff" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:54 -#: rhodecode/templates/summary/summary.html:77 +#: rhodecode/templates/summary/summary.html:69 msgid "Mercurial repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:56 -#: rhodecode/templates/summary/summary.html:80 +#: rhodecode/templates/summary/summary.html:72 msgid "Git repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:63 -#: rhodecode/templates/summary/summary.html:87 -msgid "public repository" -msgstr "" - #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/summary/summary.html:96 -#: rhodecode/templates/summary/summary.html:97 -msgid "Fork of" +#, python-format +msgid "Fork of %s" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:88 @@ -3537,8 +3611,22 @@ msgid "Confirm to delete this user: %s" msgstr "" -#: rhodecode/templates/email_templates/changeset_comment.html:10 -msgid "New status$" +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:15 +msgid "New status" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:11 +#: rhodecode/templates/email_templates/pull_request_comment.html:9 +msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:14 +msgid "Repo" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:16 +msgid "desc" msgstr "" #: rhodecode/templates/email_templates/main.html:8 @@ -3546,19 +3634,20 @@ msgstr "" #: rhodecode/templates/email_templates/password_reset.html:4 -msgid "Hello" +#, python-format +msgid "Hello %s" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.html:5 +msgid "We received a request to create a new password for your account." msgstr "" #: rhodecode/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.html:8 msgid "You can generate it by clicking following URL" msgstr "" -#: rhodecode/templates/email_templates/password_reset.html:12 -msgid "If you didn't request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:11 +msgid "If you did not request new password please ignore this email." msgstr "" #: rhodecode/templates/email_templates/pull_request.html:4 @@ -3569,33 +3658,28 @@ msgstr "" #: rhodecode/templates/email_templates/pull_request.html:5 -msgid "title" +msgid "View this pull request here" msgstr "" #: rhodecode/templates/email_templates/pull_request.html:6 -#: rhodecode/templates/pullrequests/pullrequest.html:115 -msgid "description" +msgid "title" msgstr "" #: rhodecode/templates/email_templates/pull_request.html:7 -msgid "View this pull request here" +msgid "description" msgstr "" #: rhodecode/templates/email_templates/pull_request.html:12 msgid "revisions for reviewing" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:3 #, python-format -msgid "User %s commented on pull request #%s for repository %s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:10 -msgid "New status" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:14 -msgid "View this comment here" +msgid "Pull request #%s for repository %s" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:13 +msgid "Closing pull request with status" msgstr "" #: rhodecode/templates/email_templates/registration.html:4 @@ -3606,107 +3690,105 @@ msgid "View this user here" msgstr "" -#: rhodecode/templates/errors/error_document.html:46 +#: rhodecode/templates/errors/error_document.html:55 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "" #: rhodecode/templates/files/file_diff.html:4 -#, python-format -msgid "%s File diff" -msgstr "" - -#: rhodecode/templates/files/file_diff.html:12 +#, fuzzy, python-format +msgid "%s File Diff" +msgstr "" + +#: rhodecode/templates/files/file_diff.html:8 msgid "File diff" msgstr "" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:74 -#, python-format -msgid "%s files" -msgstr "" - -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:351 -msgid "files" +#: rhodecode/templates/files/files.html:76 +#, fuzzy, python-format +msgid "%s Files" +msgstr "" + +#: rhodecode/templates/files/files.html:30 +#: rhodecode/templates/files/files_add.html:31 +#: rhodecode/templates/files/files_edit.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +msgid "Branch" msgstr "" #: rhodecode/templates/files/files_add.html:4 -#: rhodecode/templates/files/files_edit.html:4 -#, python-format -msgid "%s Edit file" +#, fuzzy, python-format +msgid "%s Files Add" msgstr "" #: rhodecode/templates/files/files_add.html:19 -msgid "add file" -msgstr "" - -#: rhodecode/templates/files/files_add.html:40 +msgid "Add file" +msgstr "" + +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:78 msgid "Add new file" msgstr "" -#: rhodecode/templates/files/files_add.html:45 +#: rhodecode/templates/files/files_add.html:43 msgid "File Name" msgstr "" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:56 msgid "or" msgstr "" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:54 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:52 msgid "Upload file" msgstr "" -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:56 msgid "Create new file" msgstr "" -#: rhodecode/templates/files/files_add.html:63 -#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_add.html:61 +#: rhodecode/templates/files/files_edit.html:37 #: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: rhodecode/templates/files/files_add.html:67 +#: rhodecode/templates/files/files_add.html:65 msgid "use / to separate directories" msgstr "" -#: rhodecode/templates/files/files_add.html:77 -#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 #: rhodecode/templates/shortlog/shortlog_data.html:6 -msgid "commit message" -msgstr "" - -#: rhodecode/templates/files/files_add.html:81 -#: rhodecode/templates/files/files_edit.html:67 +msgid "Commit message" +msgstr "" + +#: rhodecode/templates/files/files_add.html:79 +#: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "" #: rhodecode/templates/files/files_browser.html:13 -msgid "view" +msgid "View" msgstr "" #: rhodecode/templates/files/files_browser.html:14 -msgid "previous revision" +msgid "Previous revision" msgstr "" #: rhodecode/templates/files/files_browser.html:16 -msgid "next revision" +msgid "Next revision" msgstr "" #: rhodecode/templates/files/files_browser.html:23 -msgid "follow current branch" +msgid "Follow current branch" msgstr "" #: rhodecode/templates/files/files_browser.html:27 -msgid "search file list" -msgstr "" - -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -msgid "add new file" +msgid "Search file list" msgstr "" #: rhodecode/templates/files/files_browser.html:35 @@ -3733,31 +3815,36 @@ msgid "Last committer" msgstr "" +#: rhodecode/templates/files/files_edit.html:4 +#, fuzzy, python-format +msgid "%s Files Edit" +msgstr "" + #: rhodecode/templates/files/files_edit.html:19 -msgid "edit file" +msgid "Edit file" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:47 +#: rhodecode/templates/files/files_source.html:23 +msgid "Show annotation" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:48 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:55 +msgid "Show as raw" msgstr "" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:23 -msgid "show annotation" -msgstr "" - -#: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:25 -#: rhodecode/templates/files/files_source.html:55 -msgid "show as raw" -msgstr "" - -#: rhodecode/templates/files/files_edit.html:51 #: rhodecode/templates/files/files_source.html:26 -msgid "download as raw" -msgstr "" - -#: rhodecode/templates/files/files_edit.html:54 -msgid "source" -msgstr "" - -#: rhodecode/templates/files/files_edit.html:59 +msgid "Download as raw" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:52 +msgid "Source" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" msgstr "" @@ -3766,16 +3853,16 @@ msgstr "" #: rhodecode/templates/files/files_history_box.html:9 -msgid "diff to revision" +msgid "Diff to revision" msgstr "" #: rhodecode/templates/files/files_history_box.html:10 #, fuzzy -msgid "show at revision" +msgid "Show at revision" msgstr "" #: rhodecode/templates/files/files_history_box.html:11 -msgid "show full history" +msgid "Show full history" msgstr "" #: rhodecode/templates/files/files_history_box.html:16 @@ -3790,16 +3877,16 @@ msgstr "" #: rhodecode/templates/files/files_source.html:21 -msgid "show source" +msgid "Show source" msgstr "" #: rhodecode/templates/files/files_source.html:29 #, python-format -msgid "edit on branch:%s" +msgid "Edit on branch:%s" msgstr "" #: rhodecode/templates/files/files_source.html:31 -msgid "edit on branch:?" +msgid "Edit on branch:?" msgstr "" #: rhodecode/templates/files/files_source.html:31 @@ -3832,8 +3919,10 @@ msgid "%s Followers" msgstr "" -#: rhodecode/templates/followers/followers.html:13 -msgid "followers" +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:184 +msgid "Followers" msgstr "" #: rhodecode/templates/followers/followers_data.html:12 @@ -3845,32 +3934,32 @@ msgid "%s Fork" msgstr "" -#: rhodecode/templates/forks/fork.html:31 +#: rhodecode/templates/forks/fork.html:28 msgid "Fork name" msgstr "" -#: rhodecode/templates/forks/fork.html:68 +#: rhodecode/templates/forks/fork.html:65 msgid "Private" msgstr "" -#: rhodecode/templates/forks/fork.html:77 +#: rhodecode/templates/forks/fork.html:74 msgid "Copy permissions" msgstr "" -#: rhodecode/templates/forks/fork.html:81 +#: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" msgstr "" -#: rhodecode/templates/forks/fork.html:86 +#: rhodecode/templates/forks/fork.html:84 msgid "Update after clone" msgstr "" -#: rhodecode/templates/forks/fork.html:90 +#: rhodecode/templates/forks/fork.html:88 msgid "Checkout source after making a clone" msgstr "" -#: rhodecode/templates/forks/fork.html:94 -msgid "fork this repository" +#: rhodecode/templates/forks/fork.html:93 +msgid "Fork this repository" msgstr "" #: rhodecode/templates/forks/forks.html:5 @@ -3878,16 +3967,14 @@ msgid "%s Forks" msgstr "" -#: rhodecode/templates/forks/forks.html:13 -msgid "forks" +#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/summary/summary.html:189 +#: rhodecode/templates/summary/summary.html:190 +msgid "Forks" msgstr "" #: rhodecode/templates/forks/forks_data.html:17 -msgid "forked" -msgstr "" - -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" +msgid "Forked" msgstr "" #: rhodecode/templates/forks/forks_data.html:42 @@ -3903,21 +3990,15 @@ msgstr "" #: rhodecode/templates/journal/journal.html:32 -#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" #: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 -msgid "RSS feed" -msgstr "" - -#: rhodecode/templates/journal/journal.html:38 -#: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:51 msgid "Watched" msgstr "" @@ -3925,6 +4006,11 @@ msgid "No entries yet" msgstr "" +#: rhodecode/templates/journal/public_journal.html:4 +#: rhodecode/templates/journal/public_journal.html:21 +msgid "Public Journal" +msgstr "" + #: rhodecode/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "" @@ -3933,152 +4019,128 @@ msgid "RSS public journal feed" msgstr "" -#: rhodecode/templates/journal/public_journal.html:21 -msgid "Public Journal" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest.html:4 -#: rhodecode/templates/pullrequests/pullrequest.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:54 -msgid "refresh overview" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:52 msgid "Detailed compare view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:118 +#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:145 +#: rhodecode/templates/pullrequests/pullrequest.html:77 msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:97 +#: rhodecode/templates/pullrequests/pullrequest.html:83 msgid "Create new pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest.html:92 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:123 +#: rhodecode/templates/pullrequests/pullrequest.html:109 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "Closed %s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 #, python-format -msgid "with status %s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:31 -msgid "Status" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:36 +msgid "%s Pull Request #%s" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +msgid "Review status" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 -msgid "pull request was reviewed by all reviewers" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:59 +msgid "Pull request was reviewed by all reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Origin repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:83 +#: rhodecode/templates/pullrequests/pullrequest_show.html:102 msgid "Compare view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 #, fuzzy msgid "reviewer" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:164 +msgid "Add or remove reviewer to this pull request." +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:168 +#, fuzzy +msgid "Save changes" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -msgid "all pull requests" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 -msgid "All pull requests" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 -msgid "Closed" +#, python-format +msgid "%s Pull Requests" msgstr "" #: rhodecode/templates/search/search.html:6 -#, python-format -msgid "Search \"%s\" in repository: %s" +msgid "Search repository" msgstr "" #: rhodecode/templates/search/search.html:8 -#, python-format -msgid "Search \"%s\" in all repositories" -msgstr "" - -#: rhodecode/templates/search/search.html:12 -#: rhodecode/templates/search/search.html:32 -#, python-format -msgid "Search in repository: %s" -msgstr "" - -#: rhodecode/templates/search/search.html:14 -#: rhodecode/templates/search/search.html:34 +#: rhodecode/templates/search/search.html:16 msgid "Search in all repositories" msgstr "" -#: rhodecode/templates/search/search.html:48 +#: rhodecode/templates/search/search.html:50 msgid "Search term" msgstr "" -#: rhodecode/templates/search/search.html:60 +#: rhodecode/templates/search/search.html:62 msgid "Search in" msgstr "" -#: rhodecode/templates/search/search.html:63 -msgid "File contents" -msgstr "" - -#: rhodecode/templates/search/search.html:64 -msgid "Commit messages" -msgstr "" - #: rhodecode/templates/search/search.html:65 +msgid "File contents" +msgstr "" + +#: rhodecode/templates/search/search.html:66 +msgid "Commit messages" +msgstr "" + +#: rhodecode/templates/search/search.html:67 msgid "File names" msgstr "" @@ -4088,39 +4150,23 @@ msgid "Permission denied" msgstr "" -#: rhodecode/templates/settings/repo_settings.html:5 -#, python-format -msgid "%s Settings" -msgstr "" - -#: rhodecode/templates/settings/repo_settings.html:102 -msgid "Delete repository" -msgstr "" - -#: rhodecode/templates/settings/repo_settings.html:109 -msgid "Remove repo" -msgstr "" - #: rhodecode/templates/shortlog/shortlog.html:5 -#, python-format -msgid "%s Shortlog" -msgstr "" - +#, fuzzy, python-format +msgid "%s Lightweight Changelog" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog.html:11 #: rhodecode/templates/shortlog/shortlog.html:15 -#: rhodecode/templates/shortlog/shortlog.html:19 -msgid "shortlog" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" +msgid "Lightweight Changelog" msgstr "" #: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "age" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" +msgid "Age" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:20 +#, python-format +msgid "Click to open associated pull request #%s" msgstr "" #: rhodecode/templates/shortlog/shortlog_data.html:75 @@ -4140,156 +4186,165 @@ msgid "%s Summary" msgstr "" -#: rhodecode/templates/summary/summary.html:12 -msgid "summary" -msgstr "" - -#: rhodecode/templates/summary/summary.html:20 +#: rhodecode/templates/summary/summary.html:16 #, python-format -msgid "repo %s ATOM feed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:21 +msgid "%s ATOM feed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:17 #, python-format -msgid "repo %s RSS feed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:49 -#: rhodecode/templates/summary/summary.html:52 -msgid "ATOM" -msgstr "" - -#: rhodecode/templates/summary/summary.html:70 +msgid "%s RSS feed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:62 #, python-format msgid "Repository locked by %s" msgstr "" -#: rhodecode/templates/summary/summary.html:72 +#: rhodecode/templates/summary/summary.html:64 msgid "Repository unlocked" msgstr "" -#: rhodecode/templates/summary/summary.html:91 +#: rhodecode/templates/summary/summary.html:83 #, python-format msgid "Non changable ID %s" msgstr "" +#: rhodecode/templates/summary/summary.html:88 +msgid "Public" +msgstr "" + +#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:89 +msgid "Fork of" +msgstr "" + #: rhodecode/templates/summary/summary.html:96 -msgid "public" -msgstr "" - -#: rhodecode/templates/summary/summary.html:104 -msgid "remote clone" -msgstr "" - -#: rhodecode/templates/summary/summary.html:125 +msgid "Remote clone" +msgstr "" + +#: rhodecode/templates/summary/summary.html:117 msgid "Contact" msgstr "" -#: rhodecode/templates/summary/summary.html:139 +#: rhodecode/templates/summary/summary.html:131 msgid "Clone url" msgstr "" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:136 msgid "Show by Name" msgstr "" +#: rhodecode/templates/summary/summary.html:137 +msgid "Show by ID" +msgstr "" + #: rhodecode/templates/summary/summary.html:143 -msgid "Show by ID" +msgid "Trending files" msgstr "" #: rhodecode/templates/summary/summary.html:151 -msgid "Trending files" +#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" msgstr "" #: rhodecode/templates/summary/summary.html:159 -#: rhodecode/templates/summary/summary.html:175 -#: rhodecode/templates/summary/summary.html:203 -msgid "enable" -msgstr "" - -#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "" +#: rhodecode/templates/summary/summary.html:163 +msgid "There are no downloads yet" +msgstr "" + +#: rhodecode/templates/summary/summary.html:165 +msgid "Downloads are disabled for this repository" +msgstr "" + #: rhodecode/templates/summary/summary.html:171 -msgid "There are no downloads yet" -msgstr "" - -#: rhodecode/templates/summary/summary.html:173 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: rhodecode/templates/summary/summary.html:179 msgid "Download as zip" msgstr "" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:195 +#: rhodecode/templates/summary/summary.html:197 +msgid "Repository Size" +msgstr "" + +#: rhodecode/templates/summary/summary.html:204 +#: rhodecode/templates/summary/summary.html:206 +msgid "Feed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:206 +#: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:227 -msgid "Shortlog" -msgstr "" - -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:256 +msgid "Latest changes" +msgstr "" + +#: rhodecode/templates/summary/summary.html:258 msgid "Quick start" msgstr "" -#: rhodecode/templates/summary/summary.html:243 +#: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:246 +#: rhodecode/templates/summary/summary.html:275 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:304 +#: rhodecode/templates/summary/summary.html:333 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:661 +#: rhodecode/templates/summary/summary.html:380 +msgid "files" +msgstr "" + +#: rhodecode/templates/summary/summary.html:690 msgid "commits" msgstr "" -#: rhodecode/templates/summary/summary.html:662 +#: rhodecode/templates/summary/summary.html:691 msgid "files added" msgstr "" -#: rhodecode/templates/summary/summary.html:663 +#: rhodecode/templates/summary/summary.html:692 msgid "files changed" msgstr "" -#: rhodecode/templates/summary/summary.html:664 +#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "" -#: rhodecode/templates/summary/summary.html:667 +#: rhodecode/templates/summary/summary.html:695 msgid "commit" msgstr "" -#: rhodecode/templates/summary/summary.html:668 +#: rhodecode/templates/summary/summary.html:696 msgid "file added" msgstr "" -#: rhodecode/templates/summary/summary.html:669 +#: rhodecode/templates/summary/summary.html:697 msgid "file changed" msgstr "" -#: rhodecode/templates/summary/summary.html:670 +#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "" @@ -4298,7 +4353,7 @@ msgid "%s Tags" msgstr "" -#: rhodecode/templates/tags/tags.html:29 +#: rhodecode/templates/tags/tags.html:26 msgid "Compare tags" msgstr ""
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Fri Apr 05 14:09:23 2013 +0200 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Fri Apr 05 19:21:52 2013 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.1.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-01-28 00:24+0100\n" +"POT-Creation-Date: 2013-04-05 10:19-0700\n" "PO-Revision-Date: 2012-10-02 11:32+0100\n" "Last-Translator: Vincent Duvert <vincent@duvert.net>\n" "Language-Team: fr <LL@li.org>\n" @@ -22,11 +22,13 @@ msgstr "Toutes les branches" #: rhodecode/controllers/changeset.py:83 -msgid "show white space" +#, fuzzy +msgid "Show white space" msgstr "Afficher les espaces et tabulations" #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 -msgid "ignore white space" +#, fuzzy +msgid "Ignore white space" msgstr "Ignorer les espaces et tabulations" #: rhodecode/controllers/changeset.py:163 @@ -35,7 +37,7 @@ msgstr "Afficher %s lignes de contexte" #: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:416 +#: rhodecode/controllers/pullrequests.py:438 #, python-format msgid "Status change -> %s" msgstr "Changement de statut -> %s" @@ -49,8 +51,8 @@ "Le changement de statut d’un changeset associé à une pull request fermée " "n’est pas autorisé." -#: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:121 +#: rhodecode/controllers/compare.py:74 +#: rhodecode/controllers/pullrequests.py:167 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" @@ -96,107 +98,118 @@ msgstr "Flux %s de %s" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:137 -#: rhodecode/templates/changeset/changeset.html:149 -#: rhodecode/templates/compare/compare_diff.html:62 -#: rhodecode/templates/compare/compare_diff.html:73 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 -#: rhodecode/templates/pullrequests/pullrequest_show.html:171 +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Changeset was too big and was cut off..." msgstr "Cet ensemble de changements était trop important et a été découpé…" -#: rhodecode/controllers/feed.py:92 -msgid "commited on" -msgstr "a commité, le" - -#: rhodecode/controllers/files.py:86 -msgid "click here to add new file" +#: rhodecode/controllers/feed.py:91 +#, fuzzy, python-format +msgid "%s committed on %s" +msgstr "%s a commité, le %s" + +#: rhodecode/controllers/files.py:88 +#, fuzzy +msgid "Click here to add new file" msgstr "Ajouter un nouveau fichier" -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/files.py:89 #, python-format msgid "There are no files yet %s" msgstr "Il n’y a pas encore de fichiers %s" -#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338 +#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "Ce dépôt a été verrouillé par %s sur %s." -#: rhodecode/controllers/files.py:281 +#: rhodecode/controllers/files.py:279 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:295 +#: rhodecode/controllers/files.py:293 #, fuzzy, python-format msgid "Edited file %s via RhodeCode" msgstr "%s édité via RhodeCode" -#: rhodecode/controllers/files.py:311 +#: rhodecode/controllers/files.py:309 msgid "No changes" msgstr "Aucun changement" -#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384 +#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390 +#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: rhodecode/controllers/files.py:350 +#: rhodecode/controllers/files.py:347 #, fuzzy msgid "Added file via RhodeCode" msgstr "%s ajouté par RhodeCode" -#: rhodecode/controllers/files.py:370 +#: rhodecode/controllers/files.py:364 msgid "No content" msgstr "Aucun contenu" -#: rhodecode/controllers/files.py:374 +#: rhodecode/controllers/files.py:368 msgid "No filename" msgstr "Aucun nom de fichier" -#: rhodecode/controllers/files.py:416 -msgid "downloads disabled" +#: rhodecode/controllers/files.py:372 +msgid "Location must be relative path and must not contain .. in path" +msgstr "" + +#: rhodecode/controllers/files.py:420 +#, fuzzy +msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: rhodecode/controllers/files.py:427 +#: rhodecode/controllers/files.py:431 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue." -#: rhodecode/controllers/files.py:429 +#: rhodecode/controllers/files.py:433 msgid "Empty repository" msgstr "Dépôt vide." -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:435 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: rhodecode/controllers/files.py:576 -#: rhodecode/templates/changeset/changeset_range.html:13 -#: rhodecode/templates/changeset/changeset_range.html:31 +#: rhodecode/controllers/files.py:617 +#: rhodecode/templates/changeset/changeset_range.html:9 msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564 +#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 +#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "Branches" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78 -#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575 +#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 +#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "Tags" -#: rhodecode/controllers/forks.py:165 -#, python-format -msgid "forked %s repository as %s" +#: rhodecode/controllers/forks.py:175 +#, fuzzy, python-format +msgid "Forked repository %s as %s" msgstr "dépôt %s forké en tant que %s" -#: rhodecode/controllers/forks.py:179 +#: rhodecode/controllers/forks.py:189 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s." @@ -206,20 +219,20 @@ msgstr "Journal public" #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 -#: rhodecode/templates/base/base.html:238 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "Journal" -#: rhodecode/controllers/login.py:142 -msgid "You have successfully registered into rhodecode" +#: rhodecode/controllers/login.py:138 +#, fuzzy +msgid "You have successfully registered into RhodeCode" msgstr "Vous vous êtes inscrits avec succès à RhodeCode" -#: rhodecode/controllers/login.py:163 +#: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé." -#: rhodecode/controllers/login.py:183 +#: rhodecode/controllers/login.py:179 msgid "" "Your password reset was successful, new password has been sent to your " "email" @@ -227,31 +240,53 @@ "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " "été envoyé par e-mail." -#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570 +#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/email_templates/changeset_comment.html:15 +msgid "Changeset" +msgstr "Changements" + +#: rhodecode/controllers/pullrequests.py:128 +msgid "Special" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:129 +#, fuzzy +msgid "Peer branches" +msgstr "Branches" + +#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Signets" -#: rhodecode/controllers/pullrequests.py:190 +#: rhodecode/controllers/pullrequests.py:228 msgid "Pull request requires a title with min. 3 chars" msgstr "Les requêtes de pull nécessitent un titre d’au moins 3 caractères." -#: rhodecode/controllers/pullrequests.py:192 -msgid "error during creation of pull request" +#: rhodecode/controllers/pullrequests.py:230 +#, fuzzy +msgid "Error creating pull request" msgstr "Une erreur est survenue lors de la création de la requête de pull." -#: rhodecode/controllers/pullrequests.py:224 +#: rhodecode/controllers/pullrequests.py:251 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès." -#: rhodecode/controllers/pullrequests.py:227 +#: rhodecode/controllers/pullrequests.py:254 msgid "Error occurred during sending pull request" msgstr "Une erreur est survenue durant l’envoi de la requête de pull." -#: rhodecode/controllers/pullrequests.py:260 +#: rhodecode/controllers/pullrequests.py:287 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès." -#: rhodecode/controllers/pullrequests.py:451 +#: rhodecode/controllers/pullrequests.py:441 +msgid "Closing with" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:478 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" @@ -269,55 +304,12 @@ msgid "An error occurred during this search operation" msgstr "Une erreur est survenue durant l’opération de recherche." -#: rhodecode/controllers/settings.py:120 -#: rhodecode/controllers/admin/repos.py:254 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Dépôt %s mis à jour avec succès." - -#: rhodecode/controllers/settings.py:138 -#: rhodecode/controllers/admin/repos.py:272 -#, python-format -msgid "error occurred during update of repository %s" -msgstr "Une erreur est survenue lors de la mise à jour du dépôt %s." - -#: rhodecode/controllers/settings.py:163 -#: rhodecode/controllers/admin/repos.py:297 -#, python-format -msgid "deleted repository %s" -msgstr "Dépôt %s supprimé" - -#: rhodecode/controllers/settings.py:167 -#: rhodecode/controllers/admin/repos.py:307 -#: rhodecode/controllers/admin/repos.py:313 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Erreur pendant la suppression de %s" - -#: rhodecode/controllers/settings.py:186 -msgid "unlocked" -msgstr "déverrouillé" - -#: rhodecode/controllers/settings.py:189 -msgid "locked" -msgstr "verrouillé" - -#: rhodecode/controllers/settings.py:191 -#, python-format -msgid "Repository has been %s" -msgstr "Le dépôt a été %s." - -#: rhodecode/controllers/settings.py:195 -#: rhodecode/controllers/admin/repos.py:405 -msgid "An error occurred during unlocking" -msgstr "Une erreur est survenue durant le déverrouillage." - -#: rhodecode/controllers/summary.py:140 +#: rhodecode/controllers/summary.py:141 msgid "No data loaded yet" msgstr "Aucune donnée actuellement disponible." -#: rhodecode/controllers/summary.py:144 -#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/controllers/summary.py:147 +#: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt." @@ -328,7 +320,7 @@ #: rhodecode/controllers/admin/defaults.py:110 #, fuzzy -msgid "error occurred during update of defaults" +msgid "Error occurred during update of defaults" msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s." #: rhodecode/controllers/admin/ldap_settings.py:50 @@ -384,7 +376,8 @@ msgstr "Impossible d’activer LDAP. La bibliothèque « python-ldap » est manquante." #: rhodecode/controllers/admin/ldap_settings.py:147 -msgid "error occurred during update of ldap settings" +#, fuzzy +msgid "Error occurred during update of ldap settings" msgstr "Une erreur est survenue durant la mise à jour des réglages du LDAP." #: rhodecode/controllers/admin/permissions.py:60 @@ -407,45 +400,46 @@ #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 -#: rhodecode/templates/admin/repos/repo_add.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:9 +#: rhodecode/templates/admin/repos/repo_add.html:10 +#: rhodecode/templates/admin/repos/repo_add.html:14 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:133 #: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/admin/users/users.html:85 #: 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:203 -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 +#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:300 msgid "Admin" msgstr "Administration" #: rhodecode/controllers/admin/permissions.py:70 -msgid "disabled" -msgstr "Désactivé" - -#: rhodecode/controllers/admin/permissions.py:72 -msgid "allowed with manual account activation" -msgstr "Autorisé avec activation manuelle du compte" - -#: rhodecode/controllers/admin/permissions.py:74 -msgid "allowed with automatic account activation" -msgstr "Autorisé avec activation automatique du compte" - #: rhodecode/controllers/admin/permissions.py:76 #: rhodecode/controllers/admin/permissions.py:79 msgid "Disabled" msgstr "Interdite" +#: rhodecode/controllers/admin/permissions.py:72 +#, fuzzy +msgid "Allowed with manual account activation" +msgstr "Autorisé avec activation manuelle du compte" + +#: rhodecode/controllers/admin/permissions.py:74 +#, fuzzy +msgid "Allowed with automatic account activation" +msgstr "Autorisé avec activation automatique du compte" + #: rhodecode/controllers/admin/permissions.py:77 #: rhodecode/controllers/admin/permissions.py:80 msgid "Enabled" @@ -456,162 +450,239 @@ msgstr "Permissions par défaut mises à jour avec succès" #: rhodecode/controllers/admin/permissions.py:142 -msgid "error occurred during update of permissions" +#, fuzzy +msgid "Error occurred during update of permissions" msgstr "erreur pendant la mise à jour des permissions" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:127 msgid "--REMOVE FORK--" msgstr "[Pas un fork]" -#: rhodecode/controllers/admin/repos.py:162 -#, python-format -msgid "created repository %s from %s" +#: rhodecode/controllers/admin/repos.py:168 +#, fuzzy, python-format +msgid "Created repository %s from %s" msgstr "Le dépôt %s a été créé depuis %s." -#: rhodecode/controllers/admin/repos.py:166 -#, python-format -msgid "created repository %s" +#: rhodecode/controllers/admin/repos.py:174 +#, fuzzy, python-format +msgid "Created repository %s" msgstr "Le dépôt %s a été créé." #: rhodecode/controllers/admin/repos.py:197 +#, fuzzy, python-format +msgid "Error creating repository %s" +msgstr "Le dépôt %s a été créé." + +#: rhodecode/controllers/admin/repos.py:266 #, python-format -msgid "error occurred during creation of repository %s" -msgstr "Une erreur est survenue durant la création du dépôt %s." - -#: rhodecode/controllers/admin/repos.py:302 +msgid "Repository %s updated successfully" +msgstr "Dépôt %s mis à jour avec succès." + +#: rhodecode/controllers/admin/repos.py:284 +#, fuzzy, python-format +msgid "Error occurred during update of repository %s" +msgstr "Une erreur est survenue lors de la mise à jour du dépôt %s." + +#: rhodecode/controllers/admin/repos.py:311 +#: rhodecode/controllers/api/api.py:877 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/api/api.py:879 +#, fuzzy, python-format +msgid "Deleted %s forks" +msgstr "Dépôt %s supprimé" + +#: rhodecode/controllers/admin/repos.py:319 +#, fuzzy, python-format +msgid "Deleted repository %s" +msgstr "Dépôt %s supprimé" + +#: rhodecode/controllers/admin/repos.py:322 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés." -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:327 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "Erreur pendant la suppression de %s" + +#: rhodecode/controllers/admin/repos.py:365 +#, fuzzy +msgid "Repository permissions updated" +msgstr "Création de dépôt désactivée" + +#: rhodecode/controllers/admin/repos.py:384 msgid "An error occurred during deletion of repository user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur du dépôt." -#: rhodecode/controllers/admin/repos.py:350 -msgid "An error occurred during deletion of repository users groups" +#: rhodecode/controllers/admin/repos.py:403 +#, fuzzy +msgid "An error occurred during deletion of repository user groups" msgstr "" "Une erreur est survenue durant la suppression du groupe d’utilisateurs de" " ce dépôt." -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:421 msgid "An error occurred during deletion of repository stats" msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt." -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:438 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: rhodecode/controllers/admin/repos.py:425 +#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:485 +msgid "An error occurred during unlocking" +msgstr "Une erreur est survenue durant le déverrouillage." + +#: rhodecode/controllers/admin/repos.py:476 +#, fuzzy +msgid "Unlocked" +msgstr "déverrouillé" + +#: rhodecode/controllers/admin/repos.py:479 +#, fuzzy +msgid "Locked" +msgstr "verrouillé" + +#: rhodecode/controllers/admin/repos.py:481 +#, python-format +msgid "Repository has been %s" +msgstr "Le dépôt a été %s." + +#: rhodecode/controllers/admin/repos.py:505 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour." -#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:509 msgid "An error occurred during setting this repository in public journal" msgstr "" "Une erreur est survenue durant la configuration du journal public pour ce" " dépôt." -#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301 +#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect." -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:527 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés." -#: rhodecode/controllers/admin/repos.py:449 +#: rhodecode/controllers/admin/repos.py:529 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante." -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:545 msgid "Nothing" msgstr "[Aucun dépôt]" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:547 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: rhodecode/controllers/admin/repos.py:471 +#: rhodecode/controllers/admin/repos.py:551 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." -#: rhodecode/controllers/admin/repos_groups.py:136 -#, python-format -msgid "created repos group %s" +#: rhodecode/controllers/admin/repos.py:590 +#, fuzzy +msgid "An error occurred during creation of field" +msgstr "Une erreur est survenue durant la création de l’utilisateur %s." + +#: rhodecode/controllers/admin/repos.py:604 +#, fuzzy +msgid "An error occurred during removal of field" +msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail." + +#: rhodecode/controllers/admin/repos_groups.py:145 +#, fuzzy, python-format +msgid "Created repository group %s" msgstr "Le groupe de dépôts %s a été créé." -#: rhodecode/controllers/admin/repos_groups.py:148 -#, python-format -msgid "error occurred during creation of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:157 +#, fuzzy, python-format +msgid "Error occurred during creation of repository group %s" msgstr "Une erreur est survenue durant la création du groupe de dépôts %s." -#: rhodecode/controllers/admin/repos_groups.py:205 -#, python-format -msgid "updated repos group %s" -msgstr "Le groupe de dépôts %s a été mis à jour." +#: rhodecode/controllers/admin/repos_groups.py:214 +#: rhodecode/controllers/admin/repos_groups.py:286 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:220 -#, python-format -msgid "error occurred during update of repos group %s" +#, fuzzy, python-format +msgid "Updated repository group %s" +msgstr "Le groupe de dépôts %s a été mis à jour." + +#: rhodecode/controllers/admin/repos_groups.py:235 +#, fuzzy, python-format +msgid "Error occurred during update of repository group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s." -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:253 #, 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é." -#: rhodecode/controllers/admin/repos_groups.py:246 -#, python-format -msgid "removed repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:260 +#, fuzzy, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "Ce groupe contient %s dépôts et ne peut être supprimé." + +#: rhodecode/controllers/admin/repos_groups.py:266 +#, fuzzy, python-format +msgid "Removed repository group %s" msgstr "Le groupe de dépôts %s a été supprimé." -#: rhodecode/controllers/admin/repos_groups.py:252 -msgid "Cannot delete this group it still contains subgroups" -msgstr "Impossible de supprimer ce groupe : Il contient des sous-groupes." - -#: rhodecode/controllers/admin/repos_groups.py:257 -#: rhodecode/controllers/admin/repos_groups.py:262 -#, python-format -msgid "error occurred during deletion of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:271 +#, fuzzy, python-format +msgid "Error occurred during deletion of repos group %s" msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s." -#: rhodecode/controllers/admin/repos_groups.py:283 +#: rhodecode/controllers/admin/repos_groups.py:297 msgid "An error occurred during deletion of group user" msgstr "" "Une erreur est survenue durant la suppression de l’utilisateur du groupe " "de dépôts." -#: rhodecode/controllers/admin/repos_groups.py:304 -msgid "An error occurred during deletion of group users groups" +#: rhodecode/controllers/admin/repos_groups.py:318 +#, fuzzy +msgid "An error occurred during deletion of group user groups" msgstr "" "Une erreur est survenue durant la suppression du groupe d’utilisateurs du" " groupe de dépôts." -#: rhodecode/controllers/admin/settings.py:124 +#: rhodecode/controllers/admin/settings.py:126 #, fuzzy, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Après re-scan : %s ajouté(s), %s enlevé(s)" -#: rhodecode/controllers/admin/settings.py:133 +#: rhodecode/controllers/admin/settings.py:135 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée." -#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:166 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:170 #: rhodecode/controllers/admin/settings.py:301 -msgid "error occurred during updating application settings" +#, fuzzy +msgid "Error occurred during updating application settings" msgstr "Une erreur est survenue durant la mise à jour des options." -#: rhodecode/controllers/admin/settings.py:209 +#: rhodecode/controllers/admin/settings.py:216 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour." -#: rhodecode/controllers/admin/settings.py:214 -msgid "error occurred during updating visualisation settings" +#: rhodecode/controllers/admin/settings.py:221 +#, fuzzy +msgid "Error occurred during updating visualisation settings" msgstr "Une erreur est survenue durant la mise à jour des réglages d’affichages." #: rhodecode/controllers/admin/settings.py:297 @@ -627,37 +698,38 @@ msgstr "Hooks mis à jour" #: rhodecode/controllers/admin/settings.py:327 -msgid "error occurred during hook creation" +#, fuzzy +msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook." #: rhodecode/controllers/admin/settings.py:346 msgid "Email task created" msgstr "La tâche d’e-mail a été créée." -#: rhodecode/controllers/admin/settings.py:408 +#: rhodecode/controllers/admin/settings.py:410 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/controllers/admin/settings.py:448 +#: rhodecode/controllers/admin/settings.py:452 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: rhodecode/controllers/admin/settings.py:463 +#: rhodecode/controllers/admin/settings.py:467 #: rhodecode/controllers/admin/users.py:198 -#, python-format -msgid "error occurred during update of user %s" +#, fuzzy, python-format +msgid "Error occurred during update of user %s" msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s." #: rhodecode/controllers/admin/users.py:130 -#, python-format -msgid "created user %s" +#, fuzzy, python-format +msgid "Created user %s" msgstr "utilisateur %s créé" #: rhodecode/controllers/admin/users.py:142 -#, python-format -msgid "error occurred during creation of user %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user %s" msgstr "Une erreur est survenue durant la création de l’utilisateur %s." #: rhodecode/controllers/admin/users.py:176 @@ -665,7 +737,8 @@ msgstr "L’utilisateur a été mis à jour avec succès." #: rhodecode/controllers/admin/users.py:214 -msgid "successfully deleted user" +#, fuzzy +msgid "Successfully deleted user" msgstr "L’utilisateur a été supprimé avec succès." #: rhodecode/controllers/admin/users.py:219 @@ -693,7 +766,7 @@ msgstr "La permission de fork de dépôts a été révoquée à l’utilisateur." #: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:279 +#: rhodecode/controllers/admin/users_groups.py:281 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions." @@ -726,227 +799,235 @@ msgstr "L’e-mail a été enlevé de l’utilisateur." #: rhodecode/controllers/admin/users_groups.py:86 -#, python-format -msgid "created users group %s" +#, fuzzy, python-format +msgid "Created user group %s" msgstr "Le groupe d’utilisateurs %s a été créé." #: rhodecode/controllers/admin/users_groups.py:97 -#, python-format -msgid "error occurred during creation of users group %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user group %s" msgstr "Une erreur est survenue durant la création du groupe d’utilisateurs %s." -#: rhodecode/controllers/admin/users_groups.py:164 -#, python-format -msgid "updated users group %s" +#: rhodecode/controllers/admin/users_groups.py:166 +#, fuzzy, python-format +msgid "Updated user group %s" msgstr "Le groupe d’utilisateurs %s a été mis à jour." -#: rhodecode/controllers/admin/users_groups.py:186 -#, python-format -msgid "error occurred during update of users group %s" +#: rhodecode/controllers/admin/users_groups.py:188 +#, fuzzy, python-format +msgid "Error occurred during update of user group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s." -#: rhodecode/controllers/admin/users_groups.py:203 -msgid "successfully deleted users group" +#: rhodecode/controllers/admin/users_groups.py:205 +#, fuzzy +msgid "Successfully deleted user group" msgstr "Le groupe d’utilisateurs a été supprimé avec succès." -#: rhodecode/controllers/admin/users_groups.py:208 -msgid "An error occurred during deletion of users group" +#: rhodecode/controllers/admin/users_groups.py:210 +#, fuzzy +msgid "An error occurred during deletion of user group" msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs." -#: rhodecode/controllers/admin/users_groups.py:257 -msgid "Granted 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:259 +#, fuzzy +msgid "Granted 'repository create' permission to user group" msgstr "" "La permission de création de dépôts a été accordée au groupe " "d’utilisateurs." -#: rhodecode/controllers/admin/users_groups.py:262 -msgid "Revoked 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:264 +#, fuzzy +msgid "Revoked 'repository create' permission to user group" msgstr "" "La permission de création de dépôts a été révoquée au groupe " "d’utilisateurs." -#: rhodecode/controllers/admin/users_groups.py:268 -msgid "Granted 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:270 +#, fuzzy +msgid "Granted 'repository fork' permission to user group" msgstr "La permission de fork de dépôts a été accordée au groupe d’utilisateur." -#: rhodecode/controllers/admin/users_groups.py:273 -msgid "Revoked 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:275 +#, fuzzy +msgid "Revoked 'repository fork' permission to user group" msgstr "La permission de fork de dépôts a été révoquée au groupe d’utilisateurs." -#: rhodecode/lib/auth.py:509 +#: rhodecode/lib/auth.py:530 #, fuzzy, python-format msgid "IP %s not allowed" msgstr "Followers de %s" -#: rhodecode/lib/auth.py:558 +#: rhodecode/lib/auth.py:579 msgid "You need to be a registered user to perform this action" msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action." -#: rhodecode/lib/auth.py:599 +#: rhodecode/lib/auth.py:620 msgid "You need to be a signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page." -#: rhodecode/lib/diffs.py:74 -msgid "binary file" +#: rhodecode/lib/diffs.py:66 +#, fuzzy +msgid "Binary file" msgstr "Fichier binaire" -#: rhodecode/lib/diffs.py:90 +#: rhodecode/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Cet ensemble de changements était trop gros pour être affiché et a été " "découpé, utilisez le menu « Diff » pour afficher les différences." -#: rhodecode/lib/diffs.py:100 +#: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/helpers.py:374 +#: rhodecode/lib/helpers.py:394 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%d/%m/%Y à %H:%M:%S" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:506 msgid "True" msgstr "Vrai" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:509 msgid "False" msgstr "Faux" -#: rhodecode/lib/helpers.py:530 +#: rhodecode/lib/helpers.py:547 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "Dépôt %s supprimé" -#: rhodecode/lib/helpers.py:533 +#: rhodecode/lib/helpers.py:550 #, fuzzy, python-format msgid "Created tag: %s" msgstr "utilisateur %s créé" -#: rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:563 msgid "Changeset not found" msgstr "Ensemble de changements non trouvé" -#: rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:621 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:641 msgid "and" msgstr "et" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:642 #, python-format msgid "%s more" msgstr "%s de plus" -#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 msgid "revisions" msgstr "révisions" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:667 #, fuzzy, python-format msgid "fork name %s" msgstr "Nom du fork %s" -#: rhodecode/lib/helpers.py:658 -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/lib/helpers.py:684 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "Requête de pull #%s" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:690 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 +#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:694 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 +#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 +#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:674 +#: rhodecode/lib/helpers.py:700 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:682 +#: rhodecode/lib/helpers.py:708 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:710 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: rhodecode/lib/helpers.py:686 -msgid "[created] users group" +#: rhodecode/lib/helpers.py:712 +#, fuzzy +msgid "[created] user group" msgstr "[a créé] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:688 -msgid "[updated] users group" +#: rhodecode/lib/helpers.py:714 +#, fuzzy +msgid "[updated] user group" msgstr "[a mis à jour] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:716 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: rhodecode/lib/helpers.py:692 +#: rhodecode/lib/helpers.py:718 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:720 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: rhodecode/lib/helpers.py:696 +#: rhodecode/lib/helpers.py:722 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/helpers.py:698 +#: rhodecode/lib/helpers.py:724 msgid "[committed via RhodeCode] into repository" msgstr "[a commité via RhodeCode] dans le dépôt" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:726 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:728 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:730 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:732 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:884 +#: rhodecode/lib/helpers.py:910 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:888 +#: rhodecode/lib/helpers.py:914 msgid "No Files" msgstr "Aucun fichier" -#: rhodecode/lib/helpers.py:1164 +#: rhodecode/lib/helpers.py:1198 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -957,185 +1038,230 @@ "probablement été créé ou renommé manuellement. Veuillez relancer " "l’application pour rescanner les dépôts." -#: rhodecode/lib/utils2.py:403 +#: rhodecode/lib/unionrepo.py:193 +#, fuzzy +msgid "cannot create new union repository" +msgstr "[a créé] le dépôt" + +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: rhodecode/lib/utils2.py:404 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: rhodecode/lib/utils2.py:405 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: rhodecode/lib/utils2.py:406 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: rhodecode/lib/utils2.py:407 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: rhodecode/lib/utils2.py:408 +#: rhodecode/lib/utils2.py:416 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: rhodecode/lib/utils2.py:424 +#: rhodecode/lib/utils2.py:432 #, fuzzy, python-format msgid "in %s" msgstr "à la ligne %s" -#: rhodecode/lib/utils2.py:426 +#: rhodecode/lib/utils2.py:434 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: rhodecode/lib/utils2.py:428 +#: rhodecode/lib/utils2.py:436 #, fuzzy, python-format msgid "in %s and %s" msgstr "Il y a %s et %s" -#: rhodecode/lib/utils2.py:431 +#: rhodecode/lib/utils2.py:439 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:442 msgid "just now" msgstr "à l’instant" -#: rhodecode/lib/celerylib/tasks.py:270 -msgid "password reset link" -msgstr "Réinitialisation du mot de passe" - #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 msgid "Repository no access" msgstr "Aucun accès au dépôt" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 msgid "Repository read access" msgstr "Accès en lecture au dépôt" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 msgid "Repository write access" msgstr "Accès en écriture au dépôt" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 msgid "Repository admin access" msgstr "Accès administrateur au dépôt" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 msgid "Repositories Group no access" msgstr "Aucun accès au groupe de dépôts" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 msgid "Repositories Group read access" msgstr "Accès en lecture au groupe de dépôts" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 msgid "Repositories Group write access" msgstr "Accès en écriture au groupe de dépôts" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 msgid "Repositories Group admin access" msgstr "Accès administrateur au groupe de dépôts" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 msgid "RhodeCode Administrator" msgstr "Administrateur RhodeCode" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 msgid "Repository creation disabled" msgstr "Création de dépôt désactivée" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 msgid "Repository creation enabled" msgstr "Création de dépôt activée" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 msgid "Repository forking disabled" msgstr "Fork de dépôt désactivé" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 msgid "Repository forking enabled" msgstr "Fork de dépôt activé" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 msgid "Register disabled" msgstr "Enregistrement désactivé" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 msgid "Not Reviewed" msgstr "Pas encore relue" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 msgid "Approved" msgstr "Approuvée " #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 msgid "Rejected" msgstr "Rejetée" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 msgid "Under Review" msgstr "En cours de relecture" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "à la ligne %s" -#: rhodecode/model/comment.py:176 +#: rhodecode/model/comment.py:219 msgid "[Mention]" msgstr "[Mention]" +#: rhodecode/model/db.py:1252 +msgid "top level" +msgstr "" + +#: rhodecode/model/db.py:1393 +#, fuzzy +msgid "Repository group no access" +msgstr "Aucun accès au groupe de dépôts" + +#: rhodecode/model/db.py:1394 +#, fuzzy +msgid "Repository group read access" +msgstr "Accès en lecture au groupe de dépôts" + +#: rhodecode/model/db.py:1395 +#, fuzzy +msgid "Repository group write access" +msgstr "Accès en écriture au groupe de dépôts" + +#: rhodecode/model/db.py:1396 +#, fuzzy +msgid "Repository group admin access" +msgstr "Accès administrateur au groupe de dépôts" + #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "Veuillez entrer un identifiant" @@ -1154,62 +1280,65 @@ msgid "Enter %(min)i characters or more" msgstr "Entrez au moins %(min)i caractères" -#: rhodecode/model/notification.py:220 -#, fuzzy, python-format -msgid "commented on commit at %(when)s" -msgstr "a posté un commentaire sur le commit %(when)s" - -#: rhodecode/model/notification.py:221 -#, fuzzy, python-format -msgid "sent message at %(when)s" -msgstr "a envoyé un message %(when)s" - -#: rhodecode/model/notification.py:222 -#, fuzzy, python-format -msgid "mentioned you at %(when)s" -msgstr "vous a mentioné %(when)s" - -#: rhodecode/model/notification.py:223 -#, fuzzy, python-format -msgid "registered in RhodeCode at %(when)s" -msgstr "s’est enregistré sur RhodeCode %(when)s" - #: rhodecode/model/notification.py:224 #, fuzzy, python-format -msgid "opened new pull request at %(when)s" -msgstr "a ouvert une nouvelle requête de pull %(when)s" +msgid "%(user)s commented on changeset at %(when)s" +msgstr "%(user)s a posté un commentaire sur le commit %(when)s" #: rhodecode/model/notification.py:225 #, fuzzy, python-format -msgid "commented on pull request at %(when)s" -msgstr "a commenté sur la requête de pull %(when)s" - -#: rhodecode/model/pull_request.py:100 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_id)s" -msgstr "%(user)s voudrait que vous examiniez sa requête de pull nº%(pr_id)s" - -#: rhodecode/model/scm.py:556 +msgid "%(user)s sent message at %(when)s" +msgstr "%(user)s a envoyé un message %(when)s" + +#: rhodecode/model/notification.py:226 +#, fuzzy, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "%(user)s vous a mentioné %(when)s" + +#: rhodecode/model/notification.py:227 +#, fuzzy, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "%(user)s s’est enregistré sur RhodeCode %(when)s" + +#: rhodecode/model/notification.py:228 +#, fuzzy, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "%(user)s a ouvert une nouvelle requête de pull %(when)s" + +#: rhodecode/model/notification.py:229 +#, fuzzy, python-format +msgid "%(user)s commented on pull request at %(when)s" +msgstr "%(user)s a commenté sur la requête de pull %(when)s" + +#: rhodecode/model/pull_request.py:104 +#, fuzzy, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" +msgstr "" +"%(user)s voudrait que vous examiniez sa requête de pull nº%(pr_id)s: " +"%(pr_title)s" + +#: rhodecode/model/scm.py:598 msgid "latest tip" msgstr "Dernier sommet" -#: rhodecode/model/user.py:231 -msgid "new user registration" +#: rhodecode/model/user.py:232 +#, fuzzy +msgid "New user registration" msgstr "Nouveau compte utilisateur enregistré" -#: rhodecode/model/user.py:256 rhodecode/model/user.py:280 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 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:302 +#: rhodecode/model/user.py:303 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:308 +#: rhodecode/model/user.py:309 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1218,21 +1347,36 @@ "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez " "les propriétaires de ces dépôts. %s" -#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38 +#: rhodecode/model/user.py:334 +#, fuzzy +msgid "Password reset link" +msgstr "Réinitialisation du mot de passe" + +#: rhodecode/model/user.py:366 +#, fuzzy +msgid "Your new password" +msgstr "Nouveau mot de passe" + +#: rhodecode/model/user.py:367 +#, python-format +msgid "Your new RhodeCode password:%s" +msgstr "" + +#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" msgstr "Cette valeur ne peut être une liste vide." -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Le nom d’utilisateur « %(username)s » existe déjà." -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé" -#: rhodecode/model/validators.py:88 +#: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" @@ -1241,124 +1385,132 @@ "numériques ainsi que les caractères suivants : « _ . - ». Il doit " "commencer par un caractère alpha-numérique." -#: rhodecode/model/validators.py:116 +#: rhodecode/model/validators.py:117 #, python-format msgid "Username %(username)s is not valid" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide." -#: rhodecode/model/validators.py:135 -msgid "Invalid users group name" +#: rhodecode/model/validators.py:136 +#, fuzzy +msgid "Invalid user group name" msgstr "Nom de groupe d’utilisateurs invalide." -#: rhodecode/model/validators.py:136 -#, python-format -msgid "Users group \"%(usersgroup)s\" already exists" -msgstr "Le groupe d’utilisateurs « %(usersgroup)s » existe déjà." - -#: rhodecode/model/validators.py:138 +#: rhodecode/model/validators.py:137 +#, fuzzy, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "Le groupe d’utilisateurs « %(usergroup)s » existe déjà." + +#: rhodecode/model/validators.py:139 +#, fuzzy msgid "" -"users group name may only contain alphanumeric characters underscores, " +"user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" "Le nom de groupe d’utilisateurs peut contenir uniquement des caractères " "alpha-numériques ainsi que les caractères suivants : « _ . - ». Il doit " "commencer par un caractère alpha-numérique." -#: rhodecode/model/validators.py:176 +#: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" msgstr "Impossible d’assigner ce groupe en tant que parent." -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Le groupe « %(group_name)s » existe déjà." -#: rhodecode/model/validators.py:179 +#: rhodecode/model/validators.py:180 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Un dépôt portant le nom « %(group_name)s » existe déjà." -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:238 msgid "Invalid characters (non-ascii) in password" msgstr "Caractères incorrects (non-ASCII) dans le mot de passe." -#: rhodecode/model/validators.py:252 +#: rhodecode/model/validators.py:253 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas." -#: rhodecode/model/validators.py:269 +#: rhodecode/model/validators.py:270 msgid "invalid password" msgstr "mot de passe invalide" -#: rhodecode/model/validators.py:270 +#: rhodecode/model/validators.py:271 msgid "invalid user name" msgstr "nom d’utilisateur invalide" -#: rhodecode/model/validators.py:271 +#: rhodecode/model/validators.py:272 msgid "Your account is disabled" msgstr "Votre compte est désactivé" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé." -#: rhodecode/model/validators.py:317 +#: rhodecode/model/validators.py:318 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Un dépôt portant le nom « %(repo)s » existe déjà." -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »." -#: rhodecode/model/validators.py:320 -#, python-format -msgid "Repositories group with name \"%(repo)s\" already exists" +#: rhodecode/model/validators.py:321 +#, fuzzy, python-format +msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Un groupe de dépôts portant le nom « %(repo)s » existe déjà." -#: rhodecode/model/validators.py:433 +#: rhodecode/model/validators.py:438 msgid "invalid clone url" msgstr "URL de clonage invalide." -#: rhodecode/model/validators.py:434 +#: rhodecode/model/validators.py:439 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" "URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou " "svn+http(s)." -#: rhodecode/model/validators.py:459 +#: rhodecode/model/validators.py:464 msgid "Fork have to be the same type as parent" msgstr "Le fork doit être du même type que le parent." -#: rhodecode/model/validators.py:474 +#: rhodecode/model/validators.py:479 msgid "You don't have permissions to create repository in this group" msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe." -#: rhodecode/model/validators.py:501 +#: rhodecode/model/validators.py:481 +#, fuzzy +msgid "no permission to create repository in root location" +msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe." + +#: rhodecode/model/validators.py:518 #, fuzzy msgid "You don't have permissions to create a group in this location" msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe." -#: rhodecode/model/validators.py:540 -msgid "This username or users group name is not valid" +#: rhodecode/model/validators.py:557 +#, fuzzy +msgid "This username or user group name is not valid" msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide." -#: rhodecode/model/validators.py:636 +#: rhodecode/model/validators.py:650 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: rhodecode/model/validators.py:651 +#: rhodecode/model/validators.py:665 msgid "This e-mail address is already taken" msgstr "Cette adresse e-mail est déjà enregistrée" -#: rhodecode/model/validators.py:671 +#: rhodecode/model/validators.py:685 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "L’adresse e-mail « %(email)s » n’existe pas" -#: rhodecode/model/validators.py:708 +#: rhodecode/model/validators.py:722 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1366,23 +1518,27 @@ "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" " d’utilisateur." -#: rhodecode/model/validators.py:727 +#: rhodecode/model/validators.py:735 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" "Les révisions %(revs)s font déjà partie de la requête de pull ou on des " "statuts définis." -#: rhodecode/model/validators.py:759 +#: rhodecode/model/validators.py:767 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:760 +#: rhodecode/model/validators.py:768 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/templates/index.html:3 +#: rhodecode/model/validators.py:800 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "Tableau de bord" @@ -1391,223 +1547,229 @@ #: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/bookmarks/bookmarks.html:9 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:9 -#: rhodecode/templates/journal/journal.html:49 -#: rhodecode/templates/journal/journal.html:50 -#: rhodecode/templates/tags/tags.html:10 +#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:47 +#: rhodecode/templates/tags/tags.html:9 msgid "quick filter..." msgstr "Filtre rapide…" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:239 msgid "repositories" msgstr "Dépôts" -#: rhodecode/templates/index_base.html:14 -#: rhodecode/templates/index_base.html:17 +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 #: rhodecode/templates/admin/repos/repos.html:21 msgid "Add repository" msgstr "Ajouter un dépôt" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/index_base.html:20 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 +#, fuzzy +msgid "Add group" +msgstr "Édition du groupe de dépôt" + +#: rhodecode/templates/index_base.html:27 #, fuzzy msgid "Edit group" msgstr "Édition du groupe de dépôt" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:36 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "Group name" msgstr "Nom de groupe" -#: rhodecode/templates/index_base.html:37 -#: rhodecode/templates/index_base.html:79 +#: rhodecode/templates/index_base.html:41 +#: rhodecode/templates/index_base.html:83 #: rhodecode/templates/index_base.html:142 #: rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:270 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:73 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/forks/fork.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "Description" -#: rhodecode/templates/index_base.html:47 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 -msgid "Repositories group" -msgstr "Groupe de dépôts" - -#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:51 +#: rhodecode/templates/admin/permissions/permissions.html:55 +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 +#: rhodecode/templates/forks/fork.html:47 +msgid "Repository group" +msgstr "Groupe de dépôt" + +#: rhodecode/templates/index_base.html:82 #: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:271 -#: rhodecode/templates/admin/permissions/permissions.html:117 +#: rhodecode/templates/index_base.html:268 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:71 -#: rhodecode/templates/admin/users/user_edit.html:200 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:211 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 -#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/admin/users/user_edit_my_account.html:172 +#: rhodecode/templates/base/perms_summary.html:14 +#: rhodecode/templates/bookmarks/bookmarks.html:34 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:201 -#: rhodecode/templates/journal/journal.html:305 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:132 -#: rhodecode/templates/tags/tags.html:51 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/summary/summary.html:55 +#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/tags/tags.html:48 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "Nom" -#: rhodecode/templates/index_base.html:80 +#: rhodecode/templates/index_base.html:84 msgid "Last change" msgstr "Dernière modification" -#: rhodecode/templates/index_base.html:81 +#: rhodecode/templates/index_base.html:85 #: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:276 +#: rhodecode/templates/index_base.html:273 #: rhodecode/templates/admin/repos/repos.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:213 -#: rhodecode/templates/journal/journal.html:203 -#: rhodecode/templates/journal/journal.html:307 +#: rhodecode/templates/admin/users/user_edit_my_account.html:174 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:298 msgid "Tip" msgstr "Sommet" -#: rhodecode/templates/index_base.html:82 +#: rhodecode/templates/index_base.html:86 #: rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:278 +#: rhodecode/templates/index_base.html:275 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "Propriétaire" -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "RSS" - -#: rhodecode/templates/index_base.html:84 +#: rhodecode/templates/index_base.html:87 msgid "Atom" msgstr "Atom" #: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:296 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:235 +#: rhodecode/templates/admin/users/user_edit_my_account.html:196 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:225 -#: rhodecode/templates/journal/journal.html:329 -#: rhodecode/templates/tags/tags.html:77 +#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/branches/branches.html:73 +#: rhodecode/templates/journal/journal.html:217 +#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "Tri ascendant" #: rhodecode/templates/index_base.html:172 -#: rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:301 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:297 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:236 +#: rhodecode/templates/admin/users/user_edit_my_account.html:197 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:226 -#: rhodecode/templates/journal/journal.html:330 -#: rhodecode/templates/tags/tags.html:78 +#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/branches/branches.html:74 +#: rhodecode/templates/journal/journal.html:218 +#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "Tri descendant" #: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:274 +#: rhodecode/templates/index_base.html:271 msgid "Last Change" msgstr "Dernière modification" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:302 +#: rhodecode/templates/index_base.html:211 #: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:237 +#: rhodecode/templates/admin/users/user_edit_my_account.html:198 #: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:227 -#: rhodecode/templates/journal/journal.html:331 -#: rhodecode/templates/tags/tags.html:79 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:219 +#: rhodecode/templates/journal/journal.html:322 +#: rhodecode/templates/tags/tags.html:76 msgid "No records found." msgstr "Aucun élément n’a été trouvé." -#: rhodecode/templates/index_base.html:214 -#: rhodecode/templates/index_base.html:303 +#: rhodecode/templates/index_base.html:212 +#: rhodecode/templates/index_base.html:299 #: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:238 +#: rhodecode/templates/admin/users/user_edit_my_account.html:199 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:228 -#: rhodecode/templates/journal/journal.html:332 -#: rhodecode/templates/tags/tags.html:80 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:220 +#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "Erreur d’intégrité des données." -#: rhodecode/templates/index_base.html:215 -#: rhodecode/templates/index_base.html:304 +#: rhodecode/templates/index_base.html:213 +#: rhodecode/templates/index_base.html:300 #: rhodecode/templates/admin/repos/repos.html:101 -#: rhodecode/templates/admin/users/user_edit_my_account.html:105 -#: rhodecode/templates/admin/users/user_edit_my_account.html:239 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +#: rhodecode/templates/admin/users/user_edit_my_account.html:200 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:229 -#: rhodecode/templates/journal/journal.html:333 -#: rhodecode/templates/tags/tags.html:81 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:221 +#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "Chargement…" -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 -msgid "Sign In" +#: rhodecode/templates/index_base.html:298 +#, fuzzy +msgid "No repositories found." +msgstr "Groupes de dépôts" + +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +msgid "Log In" msgstr "Connexion" #: rhodecode/templates/login.html:21 -msgid "Sign In to" -msgstr "Connexion à" +#, python-format +msgid "Log In to %s" +msgstr "" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:54 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:89 -#: rhodecode/templates/summary/summary.html:131 +#: rhodecode/templates/admin/users/user_edit.html:57 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 +#: rhodecode/templates/admin/users/users.html:77 +#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "Nom d’utilisateur" #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:98 +#: rhodecode/templates/base/base.html:212 msgid "Password" msgstr "Mot de passe" @@ -1615,17 +1777,22 @@ msgid "Remember me" msgstr "Se souvenir de moi" +#: rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "Connexion" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "Mot de passe oublié ?" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 msgid "Don't have an account ?" msgstr "Vous n’avez pas de compte ?" #: rhodecode/templates/password_reset.html:5 -msgid "Reset your password" -msgstr "Mot de passe oublié ?" +#, fuzzy +msgid "Password Reset" +msgstr "Réinitialisation du mot de passe" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1657,23 +1824,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57 +#: rhodecode/templates/admin/users/user_edit.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "First Name" msgstr "Prénom" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:103 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66 +#: rhodecode/templates/admin/users/user_edit.html:106 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 msgid "Last Name" msgstr "Nom" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75 -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/admin/users/user_edit.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/summary/summary.html:125 msgid "Email" msgstr "E-mail" @@ -1685,44 +1852,31 @@ msgid "Your account must wait for activation by administrator" msgstr "Votre compte utilisateur devra être activé par un administrateur." -#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:76 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/summary/summary.html:77 msgid "Private repository" msgstr "Dépôt privé" -#: rhodecode/templates/repo_switcher_list.html:16 +#: rhodecode/templates/repo_switcher_list.html:12 +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/summary/summary.html:79 msgid "Public repository" msgstr "Dépôt public" -#: rhodecode/templates/switch_to_list.html:3 -#: rhodecode/templates/branches/branches.html:14 -msgid "branches" -msgstr "Branches" - #: rhodecode/templates/switch_to_list.html:10 #: rhodecode/templates/branches/branches_data.html:57 msgid "There are no branches yet" msgstr "Aucune branche n’a été créée pour le moment." -#: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:15 -msgid "tags" -msgstr "Tags" - #: rhodecode/templates/switch_to_list.html:22 #: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "Aucun tag n’a été créé pour le moment." -#: rhodecode/templates/switch_to_list.html:28 -#: rhodecode/templates/bookmarks/bookmarks.html:15 -msgid "bookmarks" -msgstr "Signets" - #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 msgid "There are no bookmarks yet" @@ -1730,6 +1884,7 @@ #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/base/base.html:68 msgid "Admin journal" msgstr "Historique d’administration" @@ -1754,9 +1909,12 @@ #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account.html:215 -#: rhodecode/templates/journal/journal.html:205 -#: rhodecode/templates/journal/journal.html:309 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:87 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:300 msgid "Action" msgstr "Action" @@ -1766,11 +1924,11 @@ msgstr "Dépôt" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/tags/tags.html:52 +#: rhodecode/templates/tags/tags.html:49 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "Date" @@ -1790,6 +1948,7 @@ msgstr "Groupes de dépôts" #: rhodecode/templates/admin/defaults/defaults.html:11 +#: rhodecode/templates/base/base.html:75 #, fuzzy msgid "Defaults" msgstr "[Par défaut]" @@ -1803,8 +1962,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 +#: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1834,7 +1992,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 msgid "Enable locking" msgstr "Activer le verrouillage" @@ -1846,14 +2004,17 @@ #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 #: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:148 +#: rhodecode/templates/admin/repos/repo_edit.html:173 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:137 -#: rhodecode/templates/admin/users/user_edit.html:182 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users/user_edit.html:140 +#: rhodecode/templates/admin/users/user_edit.html:185 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "Enregistrer" @@ -1862,7 +2023,10 @@ msgstr "Administration LDAP" #: rhodecode/templates/admin/ldap/ldap.html:11 -msgid "Ldap" +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:74 +#, fuzzy +msgid "LDAP" msgstr "LDAP" #: rhodecode/templates/admin/ldap/ldap.html:28 @@ -1943,8 +2107,7 @@ msgstr "Commentaires" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 msgid "Pull requests" msgstr "Requêtes de pull" @@ -1962,6 +2125,7 @@ msgstr "Notification" #: rhodecode/templates/admin/notifications/show_notification.html:9 +#: rhodecode/templates/base/base.html:241 msgid "Notifications" msgstr "Notifications" @@ -1970,11 +2134,12 @@ msgstr "Gestion des permissions" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63 -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:165 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/users/user_edit.html:150 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:86 +#: rhodecode/templates/base/base.html:73 msgid "Permissions" msgstr "Permissions" @@ -1987,8 +2152,9 @@ msgstr "Accès anonyme" #: rhodecode/templates/admin/permissions/permissions.html:49 +#, fuzzy msgid "" -"All default permissions on each repository will be reset to choosen " +"All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" @@ -1998,24 +2164,16 @@ #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -msgid "overwrite existing settings" +#, fuzzy +msgid "Overwrite existing settings" msgstr "Écraser les permissions existantes" -#: rhodecode/templates/admin/permissions/permissions.html:55 -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" -msgstr "Groupe de dépôt" - #: rhodecode/templates/admin/permissions/permissions.html:62 #, fuzzy msgid "" -"All default permissions on each repository group will be reset to choosen" -" permission, note that all custom default permission on repositories " -"group will be lost" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" msgstr "" "Les permissions par défaut de chaque dépôt vont être remplacées par la " "permission choisie. Toutes les permissions par défaut des dépôts seront " @@ -2034,22 +2192,23 @@ msgstr "Fork de dépôt" #: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:209 -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:179 -#: rhodecode/templates/admin/settings/settings.html:269 -#: rhodecode/templates/admin/users/user_edit.html:138 -#: rhodecode/templates/admin/users/user_edit.html:183 -#: rhodecode/templates/admin/users/user_edit.html:286 -#: rhodecode/templates/admin/users/user_edit.html:334 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84 +#: rhodecode/templates/admin/permissions/permissions.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:149 +#: rhodecode/templates/admin/repos/repo_edit.html:174 +#: rhodecode/templates/admin/repos/repo_edit.html:388 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:278 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users/user_edit.html:283 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:95 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:110 msgid "Reset" msgstr "Réinitialiser" @@ -2058,106 +2217,73 @@ msgid "Default User Permissions" msgstr "Permissions par défaut" -#: rhodecode/templates/admin/permissions/permissions.html:111 -#: rhodecode/templates/admin/users/user_edit.html:194 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -msgid "Nothing here yet" -msgstr "Rien ici pour le moment" - -#: rhodecode/templates/admin/permissions/permissions.html:118 -#: rhodecode/templates/admin/users/user_edit.html:201 -#: rhodecode/templates/admin/users/user_edit_my_account.html:61 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 -msgid "Permission" -msgstr "Permission" - -#: rhodecode/templates/admin/permissions/permissions.html:119 -#: rhodecode/templates/admin/users/user_edit.html:202 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 -msgid "Edit Permission" -msgstr "Éditer" - -#: rhodecode/templates/admin/permissions/permissions.html:149 -#: rhodecode/templates/admin/permissions/permissions.html:151 -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:232 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:116 -#: rhodecode/templates/data_table/_dt_elements.html:117 -msgid "edit" -msgstr "éditer" - -#: rhodecode/templates/admin/permissions/permissions.html:168 -#: rhodecode/templates/admin/users/user_edit.html:295 +#: rhodecode/templates/admin/permissions/permissions.html:113 +#: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy msgid "Allowed IP addresses" msgstr "Adresses e-mail" -#: rhodecode/templates/admin/permissions/permissions.html:182 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 -#: rhodecode/templates/admin/users/user_edit.html:263 -#: rhodecode/templates/admin/users/user_edit.html:308 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/admin/permissions/permissions.html:127 +#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 +#: rhodecode/templates/admin/users/user_edit.html:212 +#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users_groups/users_groups.html:46 #: rhodecode/templates/data_table/_dt_elements.html:122 #: rhodecode/templates/data_table/_dt_elements.html:130 msgid "delete" msgstr "Supprimer" -#: rhodecode/templates/admin/permissions/permissions.html:183 -#: rhodecode/templates/admin/users/user_edit.html:309 +#: rhodecode/templates/admin/permissions/permissions.html:128 +#: rhodecode/templates/admin/users/user_edit.html:258 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "Veuillez confirmer la suppression de l’e-mail : %s" -#: rhodecode/templates/admin/permissions/permissions.html:189 -#: rhodecode/templates/admin/users/user_edit.html:315 +#: rhodecode/templates/admin/permissions/permissions.html:134 +#: rhodecode/templates/admin/users/user_edit.html:264 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:200 -#: rhodecode/templates/admin/users/user_edit.html:326 +#: rhodecode/templates/admin/permissions/permissions.html:145 +#: rhodecode/templates/admin/users/user_edit.html:275 #, fuzzy msgid "New ip address" msgstr "Nouvelle adrese" -#: rhodecode/templates/admin/permissions/permissions.html:208 -#: rhodecode/templates/admin/users/user_edit.html:285 -#: rhodecode/templates/admin/users/user_edit.html:333 +#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:387 +#: rhodecode/templates/admin/users/user_edit.html:234 +#: rhodecode/templates/admin/users/user_edit.html:282 msgid "Add" msgstr "Ajouter" -#: rhodecode/templates/admin/repos/repo_add.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -#: rhodecode/templates/base/base.html:154 +#: rhodecode/templates/admin/repos/repo_add.html:12 +#: rhodecode/templates/admin/repos/repo_add.html:16 +#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 +#: rhodecode/templates/base/base.html:263 msgid "Repositories" msgstr "Dépôts" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +#: rhodecode/templates/admin/repos/repo_add.html:19 +#, fuzzy +msgid "Add new" msgstr "ajouter un nouveau" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:104 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Clone from" msgstr "Cloner depuis" #: rhodecode/templates/admin/repos/repo_add_base.html:24 #: rhodecode/templates/admin/repos/repo_edit.html:44 -#: rhodecode/templates/settings/repo_settings.html:43 msgid "Optional http[s] url from which repository should be cloned." msgstr "URL http(s) depuis laquelle le dépôt doit être cloné." #: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/forks/fork.html:54 +#: rhodecode/templates/forks/fork.html:51 msgid "Optionaly select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." @@ -2167,15 +2293,13 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 -#: rhodecode/templates/forks/fork.html:41 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/forks/fork.html:38 msgid "Landing revision" msgstr "Révision d’arrivée" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 -#: rhodecode/templates/forks/fork.html:45 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "Révision par défaut pour les pages de fichiers, de téléchargements, de " @@ -2183,32 +2307,29 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 -#: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:70 +#: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Gardez cette description précise et concise. Utilisez un fichier README " "pour des descriptions plus détaillées." -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -msgid "add" -msgstr "Ajouter" - -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 -msgid "add new repository" -msgstr "ajouter un nouveau dépôt" - -#: rhodecode/templates/admin/repos/repo_edit.html:5 +#: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" msgstr "Éditer le dépôt" +#: rhodecode/templates/admin/repos/repo_edit.html:12 +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:11 +#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/summary/summary.html:212 +msgid "Settings" +msgstr "Options" + #: rhodecode/templates/admin/repos/repo_edit.html:40 -#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "URL de clone" #: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 msgid "Optional select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." @@ -2216,55 +2337,56 @@ msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:152 -msgid "Administration" -msgstr "Administration" - -#: rhodecode/templates/admin/repos/repo_edit.html:155 +#: rhodecode/templates/admin/repos/repo_edit.html:184 +#, fuzzy +msgid "Advanced settings" +msgstr "Enregister les options" + +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Statistics" msgstr "Statistiques" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Reset current statistics" msgstr "Réinitialiser les statistiques" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Confirm to remove current statistics" msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "Parcouru jusqu’à la révision" -#: rhodecode/templates/admin/repos/repo_edit.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:195 msgid "Stats gathered" msgstr "Statistiques obtenues" -#: rhodecode/templates/admin/repos/repo_edit.html:171 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Remote" msgstr "Dépôt distant" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Pull changes from remote location" msgstr "Récupérer les changements depuis le site distant" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Confirm to pull changes from remote side" msgstr "Voulez-vous vraiment récupérer les changements depuis le site distant ?" -#: rhodecode/templates/admin/repos/repo_edit.html:186 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "Cache" msgstr "Cache" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Invalidate repository cache" msgstr "Invalider le cache du dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Confirm to invalidate repository cache" msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit.html:193 +#: rhodecode/templates/admin/repos/repo_edit.html:225 msgid "" "Manually invalidate cache for this repository. On first access repository" " will be cached again" @@ -2272,43 +2394,44 @@ "Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce " "dépôt, il sera à nouveau mis en cache." -#: rhodecode/templates/admin/repos/repo_edit.html:198 +#: rhodecode/templates/admin/repos/repo_edit.html:230 msgid "List of cached values" msgstr "Liste des valeurs en cache" -#: rhodecode/templates/admin/repos/repo_edit.html:201 +#: rhodecode/templates/admin/repos/repo_edit.html:233 msgid "Prefix" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:202 +#: rhodecode/templates/admin/repos/repo_edit.html:234 #, fuzzy msgid "Key" msgstr "Clé d’API" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:235 #: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:121 +#: rhodecode/templates/admin/users/user_edit.html:124 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_group_add.html:41 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +#: rhodecode/templates/admin/users_groups/users_groups.html:36 msgid "Active" msgstr "Actif" -#: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:306 -#: rhodecode/templates/base/base.html:308 -#: rhodecode/templates/base/base.html:310 +#: rhodecode/templates/admin/repos/repo_edit.html:250 +#: rhodecode/templates/base/base.html:280 +#: rhodecode/templates/base/base.html:281 msgid "Public journal" msgstr "Journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "Remove from public journal" msgstr "Supprimer du journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:226 +#: rhodecode/templates/admin/repos/repo_edit.html:258 msgid "Add to public journal" msgstr "Ajouter le dépôt au journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:231 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" @@ -2316,70 +2439,84 @@ "Le descriptif des actions réalisées sur ce dépôt sera visible à tous " "depuis le journal public." -#: rhodecode/templates/admin/repos/repo_edit.html:238 +#: rhodecode/templates/admin/repos/repo_edit.html:270 msgid "Locking" msgstr "Verrouillage" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Unlock locked repo" msgstr "Déverrouiller le dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Confirm to unlock repository" msgstr "Veuillez confirmer le déverrouillage de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "lock repo" msgstr "Verrouiller le dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to lock repository" msgstr "Veuillez confirmer le verrouillage de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:247 +#: rhodecode/templates/admin/repos/repo_edit.html:279 msgid "Repository is not locked" msgstr "Ce dépôt n’est pas verrouillé." -#: rhodecode/templates/admin/repos/repo_edit.html:252 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" "Forcer le verrouillage du dépôt. Ce réglage fonctionne uniquement quand " "l‘accès anonyme est désactivé." -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:291 msgid "Set as fork of" msgstr "Indiquer comme fork" -#: rhodecode/templates/admin/repos/repo_edit.html:264 +#: rhodecode/templates/admin/repos/repo_edit.html:296 msgid "set" msgstr "Définir" -#: rhodecode/templates/admin/repos/repo_edit.html:268 +#: rhodecode/templates/admin/repos/repo_edit.html:300 msgid "Manually set this repository as a fork of another from the list" msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste." -#: rhodecode/templates/admin/repos/repo_edit.html:274 +#: rhodecode/templates/admin/repos/repo_edit.html:306 #: rhodecode/templates/changeset/changeset_file_comment.html:41 msgid "Delete" msgstr "Supprimer" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Remove this repository" msgstr "Supprimer ce dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Confirm to delete this repository" msgstr "Voulez-vous vraiment supprimer ce dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit.html:282 -#: rhodecode/templates/settings/repo_settings.html:119 +#: rhodecode/templates/admin/repos/repo_edit.html:317 +#, fuzzy, python-format +msgid "this repository has %s fork" +msgid_plural "this repository has %s forks" +msgstr[0] "[a créé] le dépôt en tant que %s fork" +msgstr[1] "[a créé] le dépôt en tant que %s fork" + +#: rhodecode/templates/admin/repos/repo_edit.html:318 +#, fuzzy +msgid "Detach forks" +msgstr "Indiquer comme fork" + +#: rhodecode/templates/admin/repos/repo_edit.html:319 +#, fuzzy +msgid "Delete forks" +msgstr "Supprimer" + +#: rhodecode/templates/admin/repos/repo_edit.html:322 #, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need fully delete it " -"from file system please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" +" from file system please do it manually" msgstr "" "Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et " "au système de gestion de versions.\n" @@ -2389,6 +2526,37 @@ "Si vous voulez le supprimer complètement, effectuez la suppression " "manuellement." +#: rhodecode/templates/admin/repos/repo_edit.html:336 +msgid "Extra fields" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:348 +#, fuzzy, python-format +msgid "Confirm to delete this field: %s" +msgstr "Veuillez confirmer la suppression de l’e-mail : %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:362 +#, fuzzy +msgid "New field key" +msgstr "Ajouter un fichier" + +#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgid "New field label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:373 +msgid "Enter short label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:379 +#, fuzzy +msgid "New field description" +msgstr "Description" + +#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgid "Enter description of a field" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -2406,8 +2574,6 @@ #: 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:85 -#: rhodecode/templates/base/base.html:235 msgid "admin" msgstr "Administration" @@ -2417,48 +2583,48 @@ msgstr "Membre" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 -#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "Dépôt privé" #: rhodecode/templates/admin/repos/repo_edit_perms.html:19 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 msgid "default" msgstr "[Par défaut]" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 msgid "revoke" msgstr "Révoquer" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 msgid "Add another member" msgstr "Ajouter un utilisateur" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 msgid "Failed to remove user" msgstr "Échec de suppression de l’utilisateur" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 -msgid "Failed to remove users group" +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 +#, fuzzy +msgid "Failed to remove user group" msgstr "Erreur lors de la suppression du groupe d’utilisateurs." #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "Administration des dépôts" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 msgid "apply to children" msgstr "Appliquer aux enfants" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 #, fuzzy msgid "" "Set or revoke permission to all children of that group, including non-" @@ -2467,27 +2633,12 @@ "Applique ou révoque les permissions sur tous les éléments de ce groupe, " "notamment les dépôts et sous-groupes." +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#, python-format +msgid "%s Group Dashboard" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 -#: rhodecode/templates/base/base.html:128 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 msgid "Home" msgstr "Accueil" @@ -2496,45 +2647,48 @@ msgstr "comprenant" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repos group" -msgstr "Créer un groupe de dépôt" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 -msgid "Repos groups" -msgstr "Groupes de dépôts" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 -msgid "add new repos group" +#, fuzzy +msgid "Add repository group" +msgstr "Groupe de dépôt" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 +#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 +#, fuzzy +msgid "Repository groups" +msgstr "Groupe de dépôt" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 +#, fuzzy +msgid "Add new repository group" msgstr "Nouveau groupe de dépôt" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 msgid "Group parent" msgstr "Parent du groupe" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/users/user_add.html:94 -#: rhodecode/templates/admin/users_groups/users_group_add.html:49 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:149 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59 msgid "save" msgstr "Enregistrer" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repos group" -msgstr "Éditer le groupe de dépôt" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 -msgid "edit repos group" +#, fuzzy +msgid "Edit repository group" msgstr "Édition du groupe de dépôt" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 +#, fuzzy, python-format +msgid "Edit repository group %s" +msgstr "Édition du groupe de dépôt %s" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 #, fuzzy -msgid "Add new child group" +msgid "Add child group" msgstr "Ajouter un nouveau groupe" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -2543,33 +2697,38 @@ "appliquée à tous les sous-groupes et dépôts de ce groupe." #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repositories groups administration" +#, fuzzy +msgid "Repository groups administration" msgstr "Administration des groupes de dépôts" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -#, fuzzy -msgid "Add new group" -msgstr "Ajouter un nouveau groupe" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" msgstr "Nombre de sous-dépôts" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "Action" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#, fuzzy +msgid "Edit" +msgstr "éditer" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/base/perms_summary.html:29 +#: rhodecode/templates/base/perms_summary.html:48 +#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/data_table/_dt_elements.html:116 +#: rhodecode/templates/data_table/_dt_elements.html:117 +msgid "edit" +msgstr "éditer" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 #, fuzzy, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68 -msgid "There are no repositories groups yet" +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 +#, fuzzy +msgid "There are no repository groups yet" msgstr "Aucun groupe de dépôts n’a été créé pour le moment." #: rhodecode/templates/admin/settings/hooks.html:5 @@ -2577,12 +2736,6 @@ msgid "Settings administration" msgstr "Administration générale" -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:13 -msgid "Settings" -msgstr "Options" - #: rhodecode/templates/admin/settings/hooks.html:24 msgid "Built in hooks - read only" msgstr "Hooks prédéfinis (lecture seule)" @@ -2599,15 +2752,16 @@ msgid "Failed to remove hook" msgstr "Erreur lors de la suppression du hook." -#: rhodecode/templates/admin/settings/settings.html:24 +#: rhodecode/templates/admin/settings/settings.html:26 msgid "Remap and rescan repositories" msgstr "Ré-associer et re-scanner les dépôts" -#: rhodecode/templates/admin/settings/settings.html:32 -msgid "rescan option" +#: rhodecode/templates/admin/settings/settings.html:34 +#, fuzzy +msgid "Rescan option" msgstr "Option de re-scan" -#: rhodecode/templates/admin/settings/settings.html:38 +#: rhodecode/templates/admin/settings/settings.html:40 msgid "" "In case a repository was deleted from filesystem and there are leftovers " "in the database check this option to scan obsolete data in database and " @@ -2616,11 +2770,12 @@ "Cochez cette option pour supprimer d’éventuelles données obsolètes " "(concernant des dépôts manuellement supprimés) de la base de données." -#: rhodecode/templates/admin/settings/settings.html:39 -msgid "destroy old data" +#: rhodecode/templates/admin/settings/settings.html:41 +#, fuzzy +msgid "Destroy old data" msgstr "Supprimer les données obsolètes" -#: rhodecode/templates/admin/settings/settings.html:41 +#: rhodecode/templates/admin/settings/settings.html:43 msgid "" "Rescan repositories location for new repositories. Also deletes obsolete " "if `destroy` flag is checked " @@ -2629,94 +2784,102 @@ "Supprime égalements les entrées de dépôts obsolètes si « Supprimer les " "données obsolètes » est coché." -#: rhodecode/templates/admin/settings/settings.html:46 +#: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" msgstr "Re-scanner les dépôts" -#: rhodecode/templates/admin/settings/settings.html:52 +#: rhodecode/templates/admin/settings/settings.html:54 msgid "Whoosh indexing" msgstr "Indexation Whoosh" -#: rhodecode/templates/admin/settings/settings.html:60 -msgid "index build option" +#: rhodecode/templates/admin/settings/settings.html:62 +#, fuzzy +msgid "Index build option" msgstr "Option d’indexation" -#: rhodecode/templates/admin/settings/settings.html:65 -msgid "build from scratch" +#: rhodecode/templates/admin/settings/settings.html:67 +#, fuzzy +msgid "Build from scratch" msgstr "Purger et reconstruire l’index" -#: rhodecode/templates/admin/settings/settings.html:71 +#: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" msgstr "Mettre à jour l’index" -#: rhodecode/templates/admin/settings/settings.html:77 +#: rhodecode/templates/admin/settings/settings.html:79 msgid "Global application settings" msgstr "Réglages d’application globaux" -#: rhodecode/templates/admin/settings/settings.html:86 -msgid "Application name" -msgstr "Nom de l’application" - -#: rhodecode/templates/admin/settings/settings.html:95 -msgid "Realm text" -msgstr "Texte du royaume" - -#: rhodecode/templates/admin/settings/settings.html:104 -msgid "GA code" -msgstr "Code GA" - -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/settings/settings.html:268 +#: rhodecode/templates/admin/settings/settings.html:88 +msgid "Site branding" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:97 +msgid "HTTP authentication realm" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:106 +msgid "Google Analytics code" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:114 +#: rhodecode/templates/admin/settings/settings.html:186 +#: rhodecode/templates/admin/settings/settings.html:277 msgid "Save settings" msgstr "Enregister les options" -#: rhodecode/templates/admin/settings/settings.html:119 +#: rhodecode/templates/admin/settings/settings.html:121 msgid "Visualisation settings" msgstr "Réglages d’affichage" -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:129 #, fuzzy msgid "General" msgstr "Activer" -#: rhodecode/templates/admin/settings/settings.html:132 +#: rhodecode/templates/admin/settings/settings.html:134 msgid "Use lightweight dashboard" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:140 +#, fuzzy +msgid "Use repository extra fields" +msgstr "Dépôts" + +#: rhodecode/templates/admin/settings/settings.html:147 msgid "Icons" msgstr "Icônes" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Show public repo icon on repositories" msgstr "Afficher l’icône de dépôt public sur les dépôts" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:156 msgid "Show private repo icon on repositories" msgstr "Afficher l’icône de dépôt privé sur les dépôts" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:163 msgid "Meta-Tagging" msgstr "Meta-Tagging" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:168 msgid "Stylify recognised metatags:" msgstr "Styliser les méta-tags reconnus :" -#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:195 msgid "VCS settings" msgstr "Réglages de gestionnaire de version" -#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:201 -msgid "require ssl for vcs operations" +#: rhodecode/templates/admin/settings/settings.html:209 +#, fuzzy +msgid "Require SSL for vcs operations" msgstr "SSL requis pour les opérations de push/pull" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" @@ -2724,55 +2887,59 @@ "RhodeCode requièrera SSL pour les pushs et pulls. Si le SSL n’est pas " "utilisé l’erreur HTTP 406 (Non Acceptable) sera renvoyée." -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:217 msgid "Hooks" msgstr "Hooks" -#: rhodecode/templates/admin/settings/settings.html:214 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Update repository after push (hg update)" msgstr "Mettre à jour les dépôts après un push (hg update)" -#: rhodecode/templates/admin/settings/settings.html:218 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Show repository size after push" msgstr "Afficher la taille du dépôt après un push" -#: rhodecode/templates/admin/settings/settings.html:222 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "Log user push commands" msgstr "Journaliser les commandes de push" -#: rhodecode/templates/admin/settings/settings.html:226 +#: rhodecode/templates/admin/settings/settings.html:234 msgid "Log user pull commands" msgstr "Journaliser les commandes de pull" -#: rhodecode/templates/admin/settings/settings.html:230 -msgid "advanced setup" +#: rhodecode/templates/admin/settings/settings.html:238 +#, fuzzy +msgid "Advanced setup" msgstr "Avancé" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Mercurial Extensions" msgstr "Extensions Mercurial" -#: rhodecode/templates/admin/settings/settings.html:240 -msgid "largefiles extensions" +#: rhodecode/templates/admin/settings/settings.html:248 +#, fuzzy +msgid "Enable largefiles extension" msgstr "Extensions largefiles" -#: rhodecode/templates/admin/settings/settings.html:244 -msgid "hgsubversion extensions" +#: rhodecode/templates/admin/settings/settings.html:252 +#, fuzzy +msgid "Enable hgsubversion extension" msgstr "Extensions hgsubversion" -#: rhodecode/templates/admin/settings/settings.html:246 +#: rhodecode/templates/admin/settings/settings.html:254 +#, fuzzy msgid "" -"Requires hgsubversion library installed. Allows clonning from svn remote " +"Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" "Ceci nécessite l’installation de la bibliothèque hgsubversion. Permet de " "clôner à partir de dépôts Suversion." -#: rhodecode/templates/admin/settings/settings.html:256 +#: rhodecode/templates/admin/settings/settings.html:264 msgid "Repositories location" msgstr "Emplacement des dépôts" -#: rhodecode/templates/admin/settings/settings.html:261 +#: rhodecode/templates/admin/settings/settings.html:269 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " @@ -2782,12 +2949,13 @@ "vraiment le faire, redémarrer l’application une fois le changement " "effectué. Cliquez sur ce texte pour déverrouiller." -#: rhodecode/templates/admin/settings/settings.html:262 -#: rhodecode/templates/base/base.html:227 -msgid "unlock" +#: rhodecode/templates/admin/settings/settings.html:270 +#: rhodecode/templates/base/base.html:131 +#, fuzzy +msgid "Unlock" msgstr "Déverrouiller" -#: rhodecode/templates/admin/settings/settings.html:263 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" @@ -2795,25 +2963,26 @@ "Emplacement de stockage des dépôts. Si cette valeur est changée, " "Rhodecode devra être redémarré les les dépôts rescannés." -#: rhodecode/templates/admin/settings/settings.html:283 +#: rhodecode/templates/admin/settings/settings.html:292 msgid "Test Email" msgstr "E-mail de test" -#: rhodecode/templates/admin/settings/settings.html:291 +#: rhodecode/templates/admin/settings/settings.html:300 msgid "Email to" msgstr "Envoyer l’e-mail à" -#: rhodecode/templates/admin/settings/settings.html:299 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "Send" msgstr "Envoyer" -#: rhodecode/templates/admin/settings/settings.html:305 +#: rhodecode/templates/admin/settings/settings.html:314 msgid "System Info and Packages" msgstr "Information système et paquets" -#: rhodecode/templates/admin/settings/settings.html:308 -msgid "show" -msgstr "Montrer" +#: rhodecode/templates/admin/settings/settings.html:317 +#: rhodecode/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "Afficher" #: rhodecode/templates/admin/users/user_add.html:5 msgid "Add user" @@ -2821,11 +2990,14 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 +#: rhodecode/templates/base/base.html:71 msgid "Users" msgstr "Utilisateurs" #: rhodecode/templates/admin/users/user_add.html:12 -msgid "add new user" +#: rhodecode/templates/admin/users/users.html:23 +#, fuzzy +msgid "Add new user" msgstr "nouvel utilisateur" #: rhodecode/templates/admin/users/user_add.html:50 @@ -2836,6 +3008,12 @@ msgid "Edit user" msgstr "Éditer l'utilisateur" +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#, fuzzy, python-format +msgid "Edit %s" +msgstr "éditer %s" + #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 msgid "Change your avatar at" @@ -2851,30 +3029,31 @@ msgid "API key" msgstr "Clé d’API" -#: rhodecode/templates/admin/users/user_edit.html:48 -msgid "Your IP" +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 +msgid "Current IP" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:67 +#: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" msgstr "DN LDAP" -#: rhodecode/templates/admin/users/user_edit.html:76 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39 +#: rhodecode/templates/admin/users/user_edit.html:79 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password" msgstr "Nouveau mot de passe" -#: rhodecode/templates/admin/users/user_edit.html:85 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48 +#: rhodecode/templates/admin/users/user_edit.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "New password confirmation" msgstr "Confirmation du nouveau mot de passe" -#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:158 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "Utiliser les permissions par défaut" -#: rhodecode/templates/admin/users/user_edit.html:160 +#: rhodecode/templates/admin/users/user_edit.html:163 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2884,31 +3063,31 @@ "Cochez pour utiliser les permissions des les réglages %s. Si cette option" " est activée, les réglages ci-dessous n’auront pas d’effet." -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:169 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "Création de dépôts" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:177 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "Forker les dépôts" -#: rhodecode/templates/admin/users/user_edit.html:251 +#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "Adresses e-mail" -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/users/user_edit.html:213 #, python-format msgid "Confirm to delete this email: %s" msgstr "Veuillez confirmer la suppression de l’e-mail : %s" -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "New email address" msgstr "Nouvelle adrese" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:130 +#: rhodecode/templates/base/base.html:242 msgid "My account" msgstr "Mon compte" @@ -2921,7 +3100,7 @@ msgstr "Mes permissions" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:57 +#: rhodecode/templates/journal/journal.html:54 msgid "My repos" msgstr "Mes dépôts" @@ -2929,30 +3108,44 @@ msgid "My pull requests" msgstr "Mes requêtes de pull" -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/journal/journal.html:61 -msgid "Add repo" -msgstr "Ajouter un dépôt" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 +#, fuzzy +msgid "Show closed pull requests" +msgstr "[a fermé] la requête de pull de" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" msgstr "Ouvertes par moi" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 #, python-format msgid "Pull request #%s opened on %s" msgstr "Requête de pull nº%s ouverte le %s" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 +#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_show.html:27 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +msgid "Closed" +msgstr "Fermée" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 msgid "Confirm to delete this pull request" msgstr "Veuillez confirmer la suppression de cette requête de pull." -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 +msgid "Nothing here yet" +msgstr "Rien ici pour le moment" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" msgstr "Je participe à" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "Requête de pull nº%s ouverte par %s le %s" @@ -2962,68 +3155,60 @@ msgstr "Administration des utilisateurs" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:241 msgid "users" msgstr "Utilisateurs" -#: rhodecode/templates/admin/users/users.html:23 +#: rhodecode/templates/admin/users/users.html:80 #, fuzzy -msgid "Add new user" -msgstr "nouvel utilisateur" - -#: rhodecode/templates/admin/users/users.html:77 -msgid "username" -msgstr "Nom d’utilisateur" - -#: rhodecode/templates/admin/users/users.html:80 -msgid "firstname" +msgid "Firstname" msgstr "Prénom" #: rhodecode/templates/admin/users/users.html:81 -msgid "lastname" +#, fuzzy +msgid "Lastname" msgstr "Nom de famille" #: rhodecode/templates/admin/users/users.html:82 -msgid "last login" +#, fuzzy +msgid "Last login" msgstr "Dernière connexion" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" -msgstr "Actif" - -#: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:244 -msgid "ldap" -msgstr "LDAP" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -msgid "Add users group" +#, fuzzy +msgid "Add user group" msgstr "Ajouter un groupe d’utilisateur" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -msgid "Users groups" +#: rhodecode/templates/admin/users_groups/users_groups.html:11 +#: rhodecode/templates/base/base.html:72 +#, fuzzy +msgid "User groups" msgstr "Groupes d’utilisateurs" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -msgid "add new users group" +#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#, fuzzy +msgid "Add new user group" msgstr "Ajouter un nouveau groupe" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit users group" +#, fuzzy +msgid "Edit user group" msgstr "Éditer le groupe d’utilisateurs" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -msgid "UsersGroups" -msgstr "UsersGroups" +#, fuzzy +msgid "UserGroups" +msgstr "Groupes d’utilisateurs" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "Members" msgstr "Membres" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -msgid "Choosen group members" +#, fuzzy +msgid "Chosen group members" msgstr "Membres du groupe" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 @@ -3038,269 +3223,265 @@ msgid "Add all elements" msgstr "Tout ajouter" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 msgid "Group members" msgstr "Membres du groupe" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 #, fuzzy msgid "No members yet" msgstr "Membres" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 -#, fuzzy -msgid "Permissions defined for this group" -msgstr "Gestion des permissions" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 -#, fuzzy -msgid "No permissions set yet" -msgstr "Copier les permissions" - #: rhodecode/templates/admin/users_groups/users_groups.html:5 -msgid "Users groups administration" -msgstr "Gestion des groupes d’utilisateurs" - -#: rhodecode/templates/admin/users_groups/users_groups.html:23 #, fuzzy -msgid "Add new user group" -msgstr "Ajouter un nouveau groupe" - -#: rhodecode/templates/admin/users_groups/users_groups.html:32 -msgid "group name" -msgstr "Nom du groupe" - -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -#: rhodecode/templates/base/root.html:46 -msgid "members" -msgstr "Membres" - -#: rhodecode/templates/admin/users_groups/users_groups.html:45 -#, python-format -msgid "Confirm to delete this users group: %s" +msgid "User groups administration" +msgstr "Gestion des groupes d’utilisateurs" + +#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#, fuzzy, python-format +msgid "Confirm to delete this user group: %s" msgstr "Voulez-vous vraiment supprimer le groupe d‘utilisateurs « %s » ?" -#: rhodecode/templates/base/base.html:41 +#: rhodecode/templates/base/base.html:42 msgid "Submit a bug" msgstr "Signaler un bogue" -#: rhodecode/templates/base/base.html:76 -#, fuzzy -msgid "Not logged in" -msgstr "Dernière connexion" - -#: rhodecode/templates/base/base.html:83 -msgid "Login to your account" -msgstr "Connexion à votre compte" - -#: rhodecode/templates/base/base.html:106 -msgid "Forgot password ?" -msgstr "Mot de passe oublié ?" - -#: rhodecode/templates/base/base.html:113 -msgid "Log In" -msgstr "Connexion" - -#: rhodecode/templates/base/base.html:124 -msgid "Inbox" -msgstr "Boîte de réception" - -#: rhodecode/templates/base/base.html:129 -#: rhodecode/templates/base/base.html:297 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:301 -#: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/public_journal.html:4 -msgid "Journal" -msgstr "Historique" - -#: rhodecode/templates/base/base.html:131 -msgid "Log Out" -msgstr "Se déconnecter" - -#: rhodecode/templates/base/base.html:150 -msgid "Switch repository" -msgstr "Aller au dépôt" - -#: rhodecode/templates/base/base.html:152 -msgid "Products" -msgstr "Produits" - -#: rhodecode/templates/base/base.html:158 -#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47 -msgid "loading..." -msgstr "Chargement…" - -#: rhodecode/templates/base/base.html:166 -#: rhodecode/templates/base/base.html:168 -#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/base/base.html:108 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 +#: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "Résumé" -#: rhodecode/templates/base/base.html:174 -#: rhodecode/templates/base/base.html:176 -#: rhodecode/templates/base/base.html:178 -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/base/base.html:109 +#: rhodecode/templates/changelog/changelog.html:11 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "Historique" -#: rhodecode/templates/base/base.html:182 -#: rhodecode/templates/base/base.html:184 -#: rhodecode/templates/base/base.html:186 -msgid "Switch to" -msgstr "Aller" - -#: rhodecode/templates/base/base.html:193 -#: rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:110 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:12 msgid "Files" msgstr "Fichiers" -#: rhodecode/templates/base/base.html:201 -#: rhodecode/templates/base/base.html:205 +#: rhodecode/templates/base/base.html:112 +#, fuzzy +msgid "Switch To" +msgstr "Aller" + +#: rhodecode/templates/base/base.html:114 +#: rhodecode/templates/base/base.html:267 +msgid "loading..." +msgstr "Chargement…" + +#: rhodecode/templates/base/base.html:118 msgid "Options" msgstr "Options" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/base/base.html:212 -msgid "repository settings" -msgstr "Réglages de dépôt" - -#: rhodecode/templates/base/base.html:216 -#: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/forks/fork.html:13 -msgid "fork" -msgstr "Fork" - -#: rhodecode/templates/base/base.html:218 -#: rhodecode/templates/changelog/changelog.html:43 +#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "Comparer le fork" + +#: rhodecode/templates/base/base.html:126 +msgid "Lightweight changelog" +msgstr "" + +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:54 +msgid "Search" +msgstr "Rechercher" + +#: rhodecode/templates/base/base.html:133 #, fuzzy -msgid "open new pull request" -msgstr "Nouvelle requête de pull" - -#: rhodecode/templates/base/base.html:221 +msgid "Lock" +msgstr "Verrouiller" + +#: rhodecode/templates/base/base.html:141 +#, fuzzy +msgid "Follow" +msgstr "followers" + +#: rhodecode/templates/base/base.html:142 #, fuzzy -msgid "compare fork" -msgstr "Comparer le fork" - -#: rhodecode/templates/base/base.html:223 -msgid "search" -msgstr "Rechercher" - -#: rhodecode/templates/base/base.html:229 -msgid "lock" -msgstr "Verrouiller" - -#: rhodecode/templates/base/base.html:240 -msgid "repositories groups" -msgstr "Groupes de dépôts" - -#: rhodecode/templates/base/base.html:242 -msgid "users groups" -msgstr "Groupes d’utilisateurs" +msgid "Unfollow" +msgstr "followers" + +#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/forks/fork.html:9 +msgid "Fork" +msgstr "Fork" + +#: rhodecode/templates/base/base.html:147 +#, fuzzy +msgid "Create Pull Request" +msgstr "Nouvelle requête de pull" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Show Pull Requests" +msgstr "Nouvelle requête de pull" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Pull Requests" +msgstr "Requêtes de pull" + +#: rhodecode/templates/base/base.html:190 +#, fuzzy +msgid "Not logged in" +msgstr "Dernière connexion" + +#: rhodecode/templates/base/base.html:197 +msgid "Login to your account" +msgstr "Connexion à votre compte" + +#: rhodecode/templates/base/base.html:220 +msgid "Forgot password ?" +msgstr "Mot de passe oublié ?" #: rhodecode/templates/base/base.html:243 -msgid "permissions" -msgstr "Permissions" - -#: rhodecode/templates/base/base.html:245 +msgid "Log Out" +msgstr "Se déconnecter" + +#: rhodecode/templates/base/base.html:262 +msgid "Switch repository" +msgstr "Aller au dépôt" + +#: rhodecode/templates/base/base.html:274 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "Historique" + +#: rhodecode/templates/base/base.html:286 #, fuzzy -msgid "defaults" -msgstr "[Par défaut]" - -#: rhodecode/templates/base/base.html:246 -msgid "settings" -msgstr "Réglages" - -#: rhodecode/templates/base/base.html:256 -#: rhodecode/templates/base/base.html:258 -msgid "Followers" -msgstr "Followers" - -#: rhodecode/templates/base/base.html:264 -#: rhodecode/templates/base/base.html:266 -msgid "Forks" -msgstr "Forks" - -#: rhodecode/templates/base/base.html:315 -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 -#: rhodecode/templates/search/search.html:52 -msgid "Search" -msgstr "Rechercher" - -#: rhodecode/templates/base/root.html:42 -msgid "add another comment" -msgstr "Nouveau commentaire" +msgid "Search in repositories" +msgstr "Rechercher dans tous les dépôts" + +#: rhodecode/templates/base/perms_summary.html:8 +#, fuzzy +msgid "No permissions defined yet" +msgstr "Copier les permissions" + +#: rhodecode/templates/base/perms_summary.html:15 +msgid "Permission" +msgstr "Permission" + +#: rhodecode/templates/base/perms_summary.html:16 +msgid "Edit Permission" +msgstr "Éditer" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/data_table/_dt_elements.html:140 -#: rhodecode/templates/summary/summary.html:57 -msgid "Stop following this repository" -msgstr "Arrêter de suivre ce dépôt" +#, fuzzy +msgid "Add another comment" +msgstr "Nouveau commentaire" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:140 +msgid "Stop following this repository" +msgstr "Arrêter de suivre ce dépôt" + +#: rhodecode/templates/base/root.html:45 msgid "Start following this repository" msgstr "Suivre ce dépôt" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Group" msgstr "Groupe" +#: rhodecode/templates/base/root.html:47 +msgid "members" +msgstr "Membres" + #: rhodecode/templates/base/root.html:48 -msgid "search truncated" -msgstr "Résultats tronqués" +#: rhodecode/templates/pullrequests/pullrequest.html:181 +#, fuzzy +msgid "Loading ..." +msgstr "Chargement…" #: rhodecode/templates/base/root.html:49 -msgid "no matching files" -msgstr "Aucun fichier ne correspond" +#, fuzzy +msgid "Search truncated" +msgstr "Résultats tronqués" #: rhodecode/templates/base/root.html:50 +#, fuzzy +msgid "No matching files" +msgstr "Aucun fichier ne correspond" + +#: rhodecode/templates/base/root.html:51 +#: rhodecode/templates/changelog/changelog.html:36 msgid "Open new pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/base/root.html:51 +#: rhodecode/templates/base/root.html:52 #, fuzzy msgid "Open new pull request for selected changesets" msgstr "a ouvert une nouvelle requête de pull" -#: rhodecode/templates/base/root.html:52 -msgid "Show selected changes __S -> __E" +#: rhodecode/templates/base/root.html:53 +#, fuzzy +msgid "Show selected changesets __S -> __E" msgstr "Afficher les changements sélections de __S à __E" -#: rhodecode/templates/base/root.html:53 +#: rhodecode/templates/base/root.html:54 +#, fuzzy +msgid "Show selected changeset __S" +msgstr "Afficher les changements sélections de __S à __E" + +#: rhodecode/templates/base/root.html:55 msgid "Selection link" msgstr "Lien vers la sélection" +#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/changeset/diff_block.html:8 +#, fuzzy +msgid "Collapse diff" +msgstr "Diff de fichier" + +#: rhodecode/templates/base/root.html:57 +#, fuzzy +msgid "Expand diff" +msgstr "Diff brut" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "Signets de %s" -#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "Auteur" -#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks.html:38 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/tags/tags.html:55 +#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "Révision" @@ -3310,15 +3491,13 @@ msgid "%s Branches" msgstr "Branches de %s" -#: rhodecode/templates/branches/branches.html:29 +#: rhodecode/templates/branches/branches.html:26 msgid "Compare branches" msgstr "Comparer les branches" -#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches.html:53 #: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/compare/compare_diff.html:5 -#: rhodecode/templates/compare/compare_diff.html:13 -#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "Comparer" @@ -3328,118 +3507,85 @@ msgid "%s Changelog" msgstr "Historique de %s" -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/changelog/changelog.html:11 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "Affichage de %d révision sur %d" msgstr[1] "Affichage de %d révisions sur %d" -#: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/changelog/changelog.html:30 #, fuzzy msgid "Clear selection" msgstr "Réglages de recherche" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 #: rhodecode/templates/forks/forks_data.html:19 -#, python-format -msgid "compare fork with %s" +#, fuzzy, python-format +msgid "Compare fork with %s" msgstr "Comparer le fork avec %s" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 #, fuzzy msgid "Compare fork with parent" msgstr "Comparer le fork avec %s" -#: rhodecode/templates/changelog/changelog.html:49 -msgid "Show" -msgstr "Afficher" - -#: rhodecode/templates/changelog/changelog.html:74 -#: rhodecode/templates/summary/summary.html:375 -msgid "show more" +#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/summary/summary.html:404 +#, fuzzy +msgid "Show more" msgstr "montrer plus" -#: rhodecode/templates/changelog/changelog.html:78 -msgid "Affected number of files, click to show more details" -msgstr "Nombre de fichiers modifiés, cliquez pour plus de détails" - -#: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:65 -#: rhodecode/templates/changeset/changeset_file_comment.html:20 -#: rhodecode/templates/changeset/changeset_range.html:46 -msgid "Changeset status" -msgstr "Statut du changeset" - -#: rhodecode/templates/changelog/changelog.html:94 -#: rhodecode/templates/shortlog/shortlog_data.html:20 -#, python-format -msgid "Click to open associated pull request #%s" -msgstr "Cliquez ici pour ouvrir la requête de pull associée #%s." - -#: rhodecode/templates/changelog/changelog.html:104 -msgid "Parent" -msgstr "Parent" - -#: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:42 -msgid "No parents" -msgstr "Aucun parent" - -#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changeset/changeset_range.html:86 +#, fuzzy, python-format +msgid "Bookmark %s" +msgstr "Signets %s" + +#: rhodecode/templates/changelog/changelog.html:95 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset_range.html:92 +#, fuzzy, python-format +msgid "Tag %s" +msgstr "Tags %s" + +#: rhodecode/templates/changelog/changelog.html:100 #: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:79 -msgid "merge" -msgstr "Fusion" - -#: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:109 -#: rhodecode/templates/changeset/changeset_range.html:82 -#: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_add.html:33 -#: rhodecode/templates/files/files_edit.html:33 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -msgid "branch" -msgstr "Branche" - -#: rhodecode/templates/changelog/changelog.html:124 -#: rhodecode/templates/changeset/changeset_range.html:88 -msgid "bookmark" -msgstr "Signet" - -#: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:114 -#: rhodecode/templates/changeset/changeset_range.html:94 -msgid "tag" -msgstr "Tag" - -#: rhodecode/templates/changelog/changelog.html:302 +#: rhodecode/templates/changeset/changeset_range.html:80 +#, fuzzy, python-format +msgid "Branch %s" +msgstr "Branches %s" + +#: rhodecode/templates/changelog/changelog.html:258 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:94 -msgid "removed" +#: rhodecode/templates/changeset/changeset.html:91 +#, fuzzy +msgid "Removed" msgstr "Supprimés" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:95 -msgid "changed" +#: rhodecode/templates/changeset/changeset.html:92 +#, fuzzy +msgid "Changed" msgstr "Modifiés" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:96 -msgid "added" +#: rhodecode/templates/changeset/changeset.html:93 +#, fuzzy +msgid "Added" msgstr "Ajoutés" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:98 -#: rhodecode/templates/changeset/changeset.html:99 -#: rhodecode/templates/changeset/changeset.html:100 -#, python-format -msgid "affected %s files" +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changeset/changeset.html:97 +#, fuzzy, python-format +msgid "Affected %s files" msgstr "%s fichiers affectés" #: rhodecode/templates/changeset/changeset.html:6 @@ -3447,31 +3593,39 @@ msgid "%s Changeset" msgstr "Changeset de %s" -#: rhodecode/templates/changeset/changeset.html:14 -msgid "Changeset" -msgstr "Changements" - -#: rhodecode/templates/changeset/changeset.html:52 +#: rhodecode/templates/changeset/changeset.html:39 +msgid "No parents" +msgstr "Aucun parent" + +#: rhodecode/templates/changeset/changeset.html:49 #, fuzzy msgid "No children" msgstr "Appliquer aux enfants" -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/diff_block.html:20 -msgid "raw diff" -msgstr "Diff brut" - -#: rhodecode/templates/changeset/changeset.html:71 +#: rhodecode/templates/changeset/changeset.html:62 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:44 +msgid "Changeset status" +msgstr "Statut du changeset" + +#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/diff_block.html:23 #, fuzzy -msgid "patch diff" +msgid "Raw diff" +msgstr "Diff brut" + +#: rhodecode/templates/changeset/changeset.html:68 +#, fuzzy +msgid "Patch diff" msgstr "Diff brut" -#: rhodecode/templates/changeset/changeset.html:72 -#: rhodecode/templates/changeset/diff_block.html:21 -msgid "download diff" +#: rhodecode/templates/changeset/changeset.html:69 +#: rhodecode/templates/changeset/diff_block.html:24 +#, fuzzy +msgid "Download diff" msgstr "Télécharger le diff" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "%d comment" @@ -3479,7 +3633,7 @@ msgstr[0] "%d commentaire" msgstr[1] "%d commentaires" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "(%d inline)" @@ -3487,32 +3641,54 @@ msgstr[0] "(et %d en ligne)" msgstr[1] "(et %d en ligne)" -#: rhodecode/templates/changeset/changeset.html:122 -#: rhodecode/templates/compare/compare_diff.html:44 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:77 +msgid "merge" +msgstr "Fusion" + +#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/compare/compare_diff.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, fuzzy, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s fichié modifié" msgstr[1] "%s fichié modifié" -#: rhodecode/templates/changeset/changeset.html:124 -#: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/pullrequests/pullrequest_show.html:96 +#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/compare/compare_diff.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, fuzzy, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s fichiers affectés avec %s insertions et %s suppressions" msgstr[1] "%s fichiers affectés avec %s insertions et %s suppressions" +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Showing a huge diff might take some time and resources" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +#, fuzzy +msgid "Show full diff" +msgstr "Chargement de la liste des fichiers…" + #: rhodecode/templates/changeset/changeset_file_comment.html:30 -#, python-format -msgid "Status from pull request %s" +#, fuzzy, python-format +msgid "Status change on pull request #%s" msgstr "Requêtes de pull %s" #: rhodecode/templates/changeset/changeset_file_comment.html:32 -#, python-format -msgid "Comment from pull request %s" +#, fuzzy, python-format +msgid "Comment on pull request #%s" msgstr "[a commenté] la requête de pull pour %s" #: rhodecode/templates/changeset/changeset_file_comment.html:57 @@ -3524,7 +3700,7 @@ msgstr "Commentaire sur la ligne {1}." #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:139 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" @@ -3532,21 +3708,21 @@ "commande %s." #: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:142 +#: rhodecode/templates/changeset/changeset_file_comment.html:141 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à " "l’utilisateur RhodeCode en question." #: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:162 +#: rhodecode/templates/changeset/changeset_file_comment.html:161 msgid "Comment" msgstr "Commentaire" #: rhodecode/templates/changeset/changeset_file_comment.html:75 -#: rhodecode/templates/changeset/changeset_file_comment.html:86 -msgid "Hide" -msgstr "Masquer" +#, fuzzy +msgid "Cancel" +msgstr "Modifiés" #: rhodecode/templates/changeset/changeset_file_comment.html:82 msgid "You need to be logged in to comment." @@ -3556,19 +3732,16 @@ msgid "Login now" msgstr "Se connecter maintenant" -#: rhodecode/templates/changeset/changeset_file_comment.html:137 -msgid "Leave a comment" -msgstr "Laisser un commentaire" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "Check this to change current status of code-review for this changeset" -msgstr "Cochez pour changer le statut de la relecture de code pour ce changeset" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "change status" +#: rhodecode/templates/changeset/changeset_file_comment.html:86 +msgid "Hide" +msgstr "Masquer" + +#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#, fuzzy +msgid "Change status" msgstr "Modifier le statut" -#: rhodecode/templates/changeset/changeset_file_comment.html:164 +#: rhodecode/templates/changeset/changeset_file_comment.html:163 msgid "Comment and close" msgstr "Commenter et fermer" @@ -3577,72 +3750,79 @@ msgid "%s Changesets" msgstr "Changesets de %s" -#: rhodecode/templates/changeset/changeset_range.html:29 -#: rhodecode/templates/compare/compare_diff.html:29 -msgid "Compare View" -msgstr "Comparaison" - -#: rhodecode/templates/changeset/changeset_range.html:29 -#, fuzzy -msgid "Show combined compare" -msgstr "Afficher les commentaires" - -#: rhodecode/templates/changeset/changeset_range.html:54 +#: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" msgstr "Fichiers affectés" -#: rhodecode/templates/changeset/diff_block.html:19 -msgid "show full diff for this file" +#: rhodecode/templates/changeset/diff_block.html:22 +msgid "Show full diff for this file" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:27 -msgid "show inline comments" +#: rhodecode/templates/changeset/diff_block.html:30 +#, fuzzy +msgid "Show inline comments" msgstr "Afficher les commentaires" -#: rhodecode/templates/compare/compare_cs.html:5 +#: rhodecode/templates/changeset/diff_block.html:55 +msgid "Show file at latest version in this repo" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:56 +msgid "Show file at initial version in this repo" +msgstr "" + +#: rhodecode/templates/compare/compare_cs.html:4 msgid "No changesets" msgstr "Aucun changeset" -#: rhodecode/templates/compare/compare_diff.html:37 -#: rhodecode/templates/pullrequests/pullrequest_show.html:87 +#: rhodecode/templates/compare/compare_cs.html:32 +#, fuzzy +msgid "Ancestor" +msgstr "Branches" + +#: rhodecode/templates/compare/compare_diff.html:5 +#, fuzzy, python-format +msgid "%s Compare" +msgstr "%s Comparer" + +#: rhodecode/templates/compare/compare_diff.html:9 +#, fuzzy +msgid "Compare revisions" +msgstr "révision précédente" + +#: rhodecode/templates/compare/compare_diff.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:106 #, fuzzy, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "Afficher %s les commentaires" msgstr[1] "Afficher %s les commentaires" -#: rhodecode/templates/compare/compare_diff.html:52 -#: rhodecode/templates/pullrequests/pullrequest_show.html:102 +#: rhodecode/templates/compare/compare_diff.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:121 #, fuzzy msgid "No files" msgstr "Fichiers" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 -msgid "Fork" -msgstr "Fork" +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +msgid "confirm to show potentially huge diff" +msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:54 -#: rhodecode/templates/summary/summary.html:77 +#: rhodecode/templates/summary/summary.html:69 msgid "Mercurial repository" msgstr "Dépôt Mercurial" #: rhodecode/templates/data_table/_dt_elements.html:56 -#: rhodecode/templates/summary/summary.html:80 +#: rhodecode/templates/summary/summary.html:72 msgid "Git repository" msgstr "Dépôt Git" -#: rhodecode/templates/data_table/_dt_elements.html:63 -#: rhodecode/templates/summary/summary.html:87 -msgid "public repository" -msgstr "Dépôt public" - #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/summary/summary.html:96 -#: rhodecode/templates/summary/summary.html:97 -msgid "Fork of" -msgstr "Fork de" +#, fuzzy, python-format +msgid "Fork of %s" +msgstr "Nom du fork %s" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3670,30 +3850,46 @@ msgid "Confirm to delete this user: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" -#: rhodecode/templates/email_templates/changeset_comment.html:10 +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:15 #, fuzzy -msgid "New status$" +msgid "New status" msgstr "Modifier le statut" +#: rhodecode/templates/email_templates/changeset_comment.html:11 +#: rhodecode/templates/email_templates/pull_request_comment.html:9 +msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:14 +#, fuzzy +msgid "Repo" +msgstr "Mes dépôts" + +#: rhodecode/templates/email_templates/changeset_comment.html:16 +msgid "desc" +msgstr "" + #: rhodecode/templates/email_templates/main.html:8 #, fuzzy msgid "This is a notification from RhodeCode." msgstr "Ceci est une notification de RhodeCode." #: rhodecode/templates/email_templates/password_reset.html:4 -msgid "Hello" +#, python-format +msgid "Hello %s" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.html:5 +msgid "We received a request to create a new password for your account." msgstr "" #: rhodecode/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.html:8 msgid "You can generate it by clicking following URL" msgstr "" -#: rhodecode/templates/email_templates/password_reset.html:12 -msgid "If you didn't request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:11 +msgid "If you did not request new password please ignore this email." msgstr "" #: rhodecode/templates/email_templates/pull_request.html:4 @@ -3705,36 +3901,31 @@ #: rhodecode/templates/email_templates/pull_request.html:5 #, fuzzy -msgid "title" -msgstr "Titre" +msgid "View this pull request here" +msgstr "Ajouter un relecteur à cette requête de pull." #: rhodecode/templates/email_templates/pull_request.html:6 -#: rhodecode/templates/pullrequests/pullrequest.html:115 +#, fuzzy +msgid "title" +msgstr "Titre" + +#: rhodecode/templates/email_templates/pull_request.html:7 msgid "description" msgstr "Description" -#: rhodecode/templates/email_templates/pull_request.html:7 -#, fuzzy -msgid "View this pull request here" -msgstr "Ajouter un relecteur à cette requête de pull." - #: rhodecode/templates/email_templates/pull_request.html:12 msgid "revisions for reviewing" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:3 #, fuzzy, python-format -msgid "User %s commented on pull request #%s for repository %s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:10 +msgid "Pull request #%s for repository %s" +msgstr "Requête de pull nº%s ouverte le %s" + +#: rhodecode/templates/email_templates/pull_request_comment.html:13 #, fuzzy -msgid "New status" -msgstr "Modifier le statut" - -#: rhodecode/templates/email_templates/pull_request_comment.html:14 -msgid "View this comment here" -msgstr "" +msgid "Closing pull request with status" +msgstr "Statut de la requête de pull" #: rhodecode/templates/email_templates/registration.html:4 #, fuzzy @@ -3745,109 +3936,115 @@ msgid "View this user here" msgstr "" -#: rhodecode/templates/errors/error_document.html:46 +#: rhodecode/templates/errors/error_document.html:55 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "Vous serez redirigé vers %s dans %s secondes." #: rhodecode/templates/files/file_diff.html:4 -#, python-format -msgid "%s File diff" +#, fuzzy, python-format +msgid "%s File Diff" msgstr "Diff de fichier de %s" -#: rhodecode/templates/files/file_diff.html:12 +#: rhodecode/templates/files/file_diff.html:8 msgid "File diff" msgstr "Diff de fichier" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:74 -#, python-format -msgid "%s files" +#: rhodecode/templates/files/files.html:76 +#, fuzzy, python-format +msgid "%s Files" msgstr "Fichiers de %s" -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:351 -msgid "files" -msgstr "Fichiers" +#: rhodecode/templates/files/files.html:30 +#: rhodecode/templates/files/files_add.html:31 +#: rhodecode/templates/files/files_edit.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +#, fuzzy +msgid "Branch" +msgstr "Branche" #: rhodecode/templates/files/files_add.html:4 -#: rhodecode/templates/files/files_edit.html:4 -#, python-format -msgid "%s Edit file" -msgstr "Edition de fichier de %s" +#, fuzzy, python-format +msgid "%s Files Add" +msgstr "Fichiers de %s" #: rhodecode/templates/files/files_add.html:19 -msgid "add file" +#, fuzzy +msgid "Add file" msgstr "Ajouter un fichier" -#: rhodecode/templates/files/files_add.html:40 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:78 msgid "Add new file" msgstr "Ajouter un nouveau fichier" -#: rhodecode/templates/files/files_add.html:45 +#: rhodecode/templates/files/files_add.html:43 msgid "File Name" msgstr "Nom de fichier" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:56 msgid "or" msgstr "ou" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:54 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:52 msgid "Upload file" msgstr "Téléverser un fichier" -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:56 msgid "Create new file" msgstr "Créer un nouveau fichier" -#: rhodecode/templates/files/files_add.html:63 -#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_add.html:61 +#: rhodecode/templates/files/files_edit.html:37 #: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Emplacement" -#: rhodecode/templates/files/files_add.html:67 +#: rhodecode/templates/files/files_add.html:65 msgid "use / to separate directories" msgstr "Utilisez / pour séparer les répertoires" -#: rhodecode/templates/files/files_add.html:77 -#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 #: rhodecode/templates/shortlog/shortlog_data.html:6 -msgid "commit message" +#, fuzzy +msgid "Commit message" msgstr "Message de commit" -#: rhodecode/templates/files/files_add.html:81 -#: rhodecode/templates/files/files_edit.html:67 +#: rhodecode/templates/files/files_add.html:79 +#: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "Commiter les changements" #: rhodecode/templates/files/files_browser.html:13 -msgid "view" +#, fuzzy +msgid "View" msgstr "voir" #: rhodecode/templates/files/files_browser.html:14 -msgid "previous revision" +#, fuzzy +msgid "Previous revision" msgstr "révision précédente" #: rhodecode/templates/files/files_browser.html:16 -msgid "next revision" +#, fuzzy +msgid "Next revision" msgstr "révision suivante" #: rhodecode/templates/files/files_browser.html:23 -msgid "follow current branch" +#, fuzzy +msgid "Follow current branch" msgstr "Suivre la branche actuelle" #: rhodecode/templates/files/files_browser.html:27 -msgid "search file list" +#, fuzzy +msgid "Search file list" msgstr "Rechercher un fichier" -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -msgid "add new file" -msgstr "Ajouter un fichier" - #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." msgstr "Chargement de la liste des fichiers…" @@ -3872,31 +4069,41 @@ msgid "Last committer" msgstr "Dernier commiteur" +#: rhodecode/templates/files/files_edit.html:4 +#, fuzzy, python-format +msgid "%s Files Edit" +msgstr "Fichiers de %s" + #: rhodecode/templates/files/files_edit.html:19 -msgid "edit file" +#, fuzzy +msgid "Edit file" msgstr "Éditer le fichier" -#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -msgid "show annotation" +#, fuzzy +msgid "Show annotation" msgstr "Afficher les annotations" -#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_edit.html:48 #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 -msgid "show as raw" +#, fuzzy +msgid "Show as raw" msgstr "montrer le fichier brut" -#: rhodecode/templates/files/files_edit.html:51 +#: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -msgid "download as raw" +#, fuzzy +msgid "Download as raw" msgstr "télécharger le fichier brut" -#: rhodecode/templates/files/files_edit.html:54 -msgid "source" +#: rhodecode/templates/files/files_edit.html:52 +#, fuzzy +msgid "Source" msgstr "Source" -#: rhodecode/templates/files/files_edit.html:59 +#: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" msgstr "Édition du fichier" @@ -3905,16 +4112,18 @@ msgstr "Historique" #: rhodecode/templates/files/files_history_box.html:9 -msgid "diff to revision" +#, fuzzy +msgid "Diff to revision" msgstr "Diff avec la révision" #: rhodecode/templates/files/files_history_box.html:10 -msgid "show at revision" +#, fuzzy +msgid "Show at revision" msgstr "Afficher à la révision" #: rhodecode/templates/files/files_history_box.html:11 #, fuzzy -msgid "show full history" +msgid "Show full history" msgstr "Chargement de la liste des fichiers…" #: rhodecode/templates/files/files_history_box.html:16 @@ -3930,17 +4139,19 @@ msgstr "Chargement de la liste des fichiers…" #: rhodecode/templates/files/files_source.html:21 -msgid "show source" +#, fuzzy +msgid "Show source" msgstr "montrer les sources" #: rhodecode/templates/files/files_source.html:29 #, fuzzy, python-format -msgid "edit on branch:%s" +msgid "Edit on branch:%s" msgstr "Dépôt %s supprimé" #: rhodecode/templates/files/files_source.html:31 -msgid "edit on branch:?" -msgstr "" +#, fuzzy +msgid "Edit on branch:?" +msgstr "Dépôt %s supprimé" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -3972,9 +4183,11 @@ msgid "%s Followers" msgstr "Followers de %s" -#: rhodecode/templates/followers/followers.html:13 -msgid "followers" -msgstr "followers" +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:184 +msgid "Followers" +msgstr "Followers" #: rhodecode/templates/followers/followers_data.html:12 msgid "Started following -" @@ -3985,32 +4198,33 @@ msgid "%s Fork" msgstr "Fork de %s" -#: rhodecode/templates/forks/fork.html:31 +#: rhodecode/templates/forks/fork.html:28 msgid "Fork name" msgstr "Nom du fork" -#: rhodecode/templates/forks/fork.html:68 +#: rhodecode/templates/forks/fork.html:65 msgid "Private" msgstr "Privé" -#: rhodecode/templates/forks/fork.html:77 +#: rhodecode/templates/forks/fork.html:74 msgid "Copy permissions" msgstr "Copier les permissions" -#: rhodecode/templates/forks/fork.html:81 +#: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" msgstr "Copier les permissions depuis le dépôt forké" -#: rhodecode/templates/forks/fork.html:86 +#: rhodecode/templates/forks/fork.html:84 msgid "Update after clone" msgstr "MÀJ après le clonage" -#: rhodecode/templates/forks/fork.html:90 +#: rhodecode/templates/forks/fork.html:88 msgid "Checkout source after making a clone" msgstr "Mettre à jour depuis la source après clonage" -#: rhodecode/templates/forks/fork.html:94 -msgid "fork this repository" +#: rhodecode/templates/forks/fork.html:93 +#, fuzzy +msgid "Fork this repository" msgstr "Forker ce dépôt" #: rhodecode/templates/forks/forks.html:5 @@ -4018,18 +4232,17 @@ msgid "%s Forks" msgstr "Forks de %s" -#: rhodecode/templates/forks/forks.html:13 -msgid "forks" -msgstr "forks" +#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/summary/summary.html:189 +#: rhodecode/templates/summary/summary.html:190 +msgid "Forks" +msgstr "Forks" #: rhodecode/templates/forks/forks_data.html:17 -msgid "forked" +#, fuzzy +msgid "Forked" msgstr "forké" -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "Comparer le fork" - #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "Il n’y a pas encore de forks." @@ -4043,21 +4256,15 @@ msgstr "Flux RSS du journal" #: rhodecode/templates/journal/journal.html:32 -#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "Rafraîchir" #: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 -msgid "RSS feed" -msgstr "Flux RSS" - -#: rhodecode/templates/journal/journal.html:38 -#: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "Flux ATOM" -#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:51 msgid "Watched" msgstr "Surveillé" @@ -4065,6 +4272,11 @@ msgid "No entries yet" msgstr "Aucune entrée pour le moment" +#: rhodecode/templates/journal/public_journal.html:4 +#: rhodecode/templates/journal/public_journal.html:21 +msgid "Public Journal" +msgstr "Journal public" + #: rhodecode/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "Flux ATOM du journal public" @@ -4073,153 +4285,133 @@ msgid "RSS public journal feed" msgstr "Flux RSS du journal public" -#: rhodecode/templates/journal/public_journal.html:21 -msgid "Public Journal" -msgstr "Journal public" - #: rhodecode/templates/pullrequests/pullrequest.html:4 -#: rhodecode/templates/pullrequests/pullrequest.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.html:54 -msgid "refresh overview" -msgstr "Rafraîchir les informations" - -#: rhodecode/templates/pullrequests/pullrequest.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:52 msgid "Detailed compare view" msgstr "Comparaison détaillée" -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:118 +#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "Relecteurs de la requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "Propriétaire" -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:145 +#: rhodecode/templates/pullrequests/pullrequest.html:77 msgid "Add reviewer to this pull request." msgstr "Ajouter un relecteur à cette requête de pull." -#: rhodecode/templates/pullrequests/pullrequest.html:97 +#: rhodecode/templates/pullrequests/pullrequest.html:83 msgid "Create new pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest.html:92 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "Titre" -#: rhodecode/templates/pullrequests/pullrequest.html:123 +#: rhodecode/templates/pullrequests/pullrequest.html:109 msgid "Send pull request" msgstr "Envoyer la requête de pull" -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "Closed %s" -msgstr "Fermée %s" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "with status %s" -msgstr "avec %s comme statut." - -#: rhodecode/templates/pullrequests/pullrequest_show.html:31 -msgid "Status" -msgstr "Statut" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:36 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#, fuzzy, python-format +msgid "%s Pull Request #%s" +msgstr "%s Requête de pull #%s" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#, fuzzy +msgid "Review status" +msgstr "Modifier le statut" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" msgstr "Statut de la requête de pull" -#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" msgstr "Pas encore relue par" -#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d relecteur" msgstr[1] "%d relecteurs" -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 -msgid "pull request was reviewed by all reviewers" +#: rhodecode/templates/pullrequests/pullrequest_show.html:59 +#, fuzzy +msgid "Pull request was reviewed by all reviewers" msgstr "La requête de pull a été relue par tous les relecteurs." -#: rhodecode/templates/pullrequests/pullrequest_show.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Origin repository" msgstr "Dépôt Git" -#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" msgstr "Créé le" -#: rhodecode/templates/pullrequests/pullrequest_show.html:83 +#: rhodecode/templates/pullrequests/pullrequest_show.html:102 msgid "Compare view" msgstr "Vue de comparaison" -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 #, fuzzy msgid "reviewer" msgstr "%d relecteur" +#: rhodecode/templates/pullrequests/pullrequest_show.html:164 +#, fuzzy +msgid "Add or remove reviewer to this pull request." +msgstr "Ajouter un relecteur à cette requête de pull." + +#: rhodecode/templates/pullrequests/pullrequest_show.html:168 +#, fuzzy +msgid "Save changes" +msgstr "Aucun changement" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -msgid "all pull requests" -msgstr "Requêtes de pull" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 -msgid "All pull requests" -msgstr "Toutes les requêtes de pull" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 -msgid "Closed" -msgstr "Fermée" +#, fuzzy, python-format +msgid "%s Pull Requests" +msgstr "%s Mes requêtes de pull" #: rhodecode/templates/search/search.html:6 -#, python-format -msgid "Search \"%s\" in repository: %s" -msgstr "Rechercher « %s » dans le dépôt : %s" +#, fuzzy +msgid "Search repository" +msgstr "Rechercher dans le dépôt : %s" #: rhodecode/templates/search/search.html:8 -#, python-format -msgid "Search \"%s\" in all repositories" -msgstr "Rechercher « %s » dans tous les dépôts" - -#: rhodecode/templates/search/search.html:12 -#: rhodecode/templates/search/search.html:32 -#, python-format -msgid "Search in repository: %s" -msgstr "Rechercher dans le dépôt : %s" - -#: rhodecode/templates/search/search.html:14 -#: rhodecode/templates/search/search.html:34 +#: rhodecode/templates/search/search.html:16 msgid "Search in all repositories" msgstr "Rechercher dans tous les dépôts" -#: rhodecode/templates/search/search.html:48 +#: rhodecode/templates/search/search.html:50 msgid "Search term" msgstr "Termes de la recherches" -#: rhodecode/templates/search/search.html:60 +#: rhodecode/templates/search/search.html:62 msgid "Search in" msgstr "Rechercher dans" -#: rhodecode/templates/search/search.html:63 +#: rhodecode/templates/search/search.html:65 msgid "File contents" msgstr "Le contenu des fichiers" -#: rhodecode/templates/search/search.html:64 +#: rhodecode/templates/search/search.html:66 msgid "Commit messages" msgstr "Les messages de commit" -#: rhodecode/templates/search/search.html:65 +#: rhodecode/templates/search/search.html:67 msgid "File names" msgstr "Les noms de fichiers" @@ -4229,42 +4421,25 @@ msgid "Permission denied" msgstr "Permission refusée" -#: rhodecode/templates/settings/repo_settings.html:5 -#, python-format -msgid "%s Settings" -msgstr "Réglages de %s" - -#: rhodecode/templates/settings/repo_settings.html:102 -#, fuzzy -msgid "Delete repository" -msgstr "[a supprimé] le dépôt" - -#: rhodecode/templates/settings/repo_settings.html:109 -#, fuzzy -msgid "Remove repo" -msgstr "Enlever" - #: rhodecode/templates/shortlog/shortlog.html:5 -#, python-format -msgid "%s Shortlog" -msgstr "Résumé de %s" - +#, fuzzy, python-format +msgid "%s Lightweight Changelog" +msgstr "%s fichié modifié" + +#: rhodecode/templates/shortlog/shortlog.html:11 #: rhodecode/templates/shortlog/shortlog.html:15 -#: rhodecode/templates/shortlog/shortlog.html:19 -msgid "shortlog" -msgstr "Résumé" - -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "Révision" +msgid "Lightweight Changelog" +msgstr "" #: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "age" +#, fuzzy +msgid "Age" msgstr "Âge" -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "Auteur" +#: rhodecode/templates/shortlog/shortlog_data.html:20 +#, python-format +msgid "Click to open associated pull request #%s" +msgstr "Cliquez ici pour ouvrir la requête de pull associée #%s." #: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" @@ -4283,157 +4458,171 @@ msgid "%s Summary" msgstr "Résumé de %s" -#: rhodecode/templates/summary/summary.html:12 -msgid "summary" -msgstr "résumé" - -#: rhodecode/templates/summary/summary.html:20 -#, python-format -msgid "repo %s ATOM feed" -msgstr "Flux ATOM du dépôt %s" - -#: rhodecode/templates/summary/summary.html:21 -#, python-format -msgid "repo %s RSS feed" -msgstr "Flux RSS du dépôt %s" - -#: rhodecode/templates/summary/summary.html:49 -#: rhodecode/templates/summary/summary.html:52 -msgid "ATOM" -msgstr "ATOM" - -#: rhodecode/templates/summary/summary.html:70 +#: rhodecode/templates/summary/summary.html:16 +#, fuzzy, python-format +msgid "%s ATOM feed" +msgstr "Flux %s de" + +#: rhodecode/templates/summary/summary.html:17 +#, fuzzy, python-format +msgid "%s RSS feed" +msgstr "Flux %s de" + +#: rhodecode/templates/summary/summary.html:62 #, fuzzy, python-format msgid "Repository locked by %s" msgstr "Ce dépôt n’est pas verrouillé %s." -#: rhodecode/templates/summary/summary.html:72 +#: rhodecode/templates/summary/summary.html:64 #, fuzzy msgid "Repository unlocked" msgstr "Ce dépôt n’est pas verrouillé." -#: rhodecode/templates/summary/summary.html:91 +#: rhodecode/templates/summary/summary.html:83 #, python-format msgid "Non changable ID %s" msgstr "Identifiant permanent : %s" -#: rhodecode/templates/summary/summary.html:96 -msgid "public" +#: rhodecode/templates/summary/summary.html:88 +#, fuzzy +msgid "Public" msgstr "publique" -#: rhodecode/templates/summary/summary.html:104 -msgid "remote clone" +#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:89 +msgid "Fork of" +msgstr "Fork de" + +#: rhodecode/templates/summary/summary.html:96 +#, fuzzy +msgid "Remote clone" msgstr "Clone distant" -#: rhodecode/templates/summary/summary.html:125 +#: rhodecode/templates/summary/summary.html:117 msgid "Contact" msgstr "Contact" -#: rhodecode/templates/summary/summary.html:139 +#: rhodecode/templates/summary/summary.html:131 msgid "Clone url" msgstr "URL de clone" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:136 msgid "Show by Name" msgstr "Afficher par nom" -#: rhodecode/templates/summary/summary.html:143 +#: rhodecode/templates/summary/summary.html:137 msgid "Show by ID" msgstr "Afficher par ID" +#: rhodecode/templates/summary/summary.html:143 +msgid "Trending files" +msgstr "Populaires" + #: rhodecode/templates/summary/summary.html:151 -msgid "Trending files" -msgstr "Populaires" +#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "Activer" #: rhodecode/templates/summary/summary.html:159 -#: rhodecode/templates/summary/summary.html:175 -#: rhodecode/templates/summary/summary.html:203 -msgid "enable" -msgstr "Activer" - -#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "Téléchargements" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:163 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés." -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:165 msgid "Downloads are disabled for this repository" msgstr "Les téléchargements sont désactivés pour ce dépôt." -#: rhodecode/templates/summary/summary.html:179 +#: rhodecode/templates/summary/summary.html:171 msgid "Download as zip" msgstr "Télécharger en ZIP" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" msgstr "Télécharger une archive contenant également les sous-dépôts éventuels" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "with subrepos" msgstr "avec les sous-dépôts" -#: rhodecode/templates/summary/summary.html:195 +#: rhodecode/templates/summary/summary.html:197 +#, fuzzy +msgid "Repository Size" +msgstr "Dépôts" + +#: rhodecode/templates/summary/summary.html:204 +#: rhodecode/templates/summary/summary.html:206 +#, fuzzy +msgid "Feed" +msgstr "Flux RSS" + +#: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "Activité de commit par jour et par auteur" -#: rhodecode/templates/summary/summary.html:206 +#: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "Statistiques obtenues :" -#: rhodecode/templates/summary/summary.html:227 -msgid "Shortlog" -msgstr "Résumé des changements" - -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:256 +#, fuzzy +msgid "Latest changes" +msgstr "Dernière modification" + +#: rhodecode/templates/summary/summary.html:258 msgid "Quick start" msgstr "Démarrage rapide" -#: rhodecode/templates/summary/summary.html:243 +#: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file at revision '%s'" msgstr "Fichier « Lisez-moi » à la révision « %s »" -#: rhodecode/templates/summary/summary.html:246 +#: rhodecode/templates/summary/summary.html:275 msgid "Permalink to this readme" msgstr "Lien permanent vers ce fichier « Lisez-moi »" -#: rhodecode/templates/summary/summary.html:304 +#: rhodecode/templates/summary/summary.html:333 #, python-format msgid "Download %s as %s" msgstr "Télécharger %s comme archive %s" -#: rhodecode/templates/summary/summary.html:661 +#: rhodecode/templates/summary/summary.html:380 +msgid "files" +msgstr "Fichiers" + +#: rhodecode/templates/summary/summary.html:690 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:662 +#: rhodecode/templates/summary/summary.html:691 msgid "files added" msgstr "fichiers ajoutés" -#: rhodecode/templates/summary/summary.html:663 +#: rhodecode/templates/summary/summary.html:692 msgid "files changed" msgstr "fichiers modifiés" -#: rhodecode/templates/summary/summary.html:664 +#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "fichiers supprimés" -#: rhodecode/templates/summary/summary.html:667 +#: rhodecode/templates/summary/summary.html:695 msgid "commit" msgstr "commit" -#: rhodecode/templates/summary/summary.html:668 +#: rhodecode/templates/summary/summary.html:696 msgid "file added" msgstr "fichier ajouté" -#: rhodecode/templates/summary/summary.html:669 +#: rhodecode/templates/summary/summary.html:697 msgid "file changed" msgstr "fichié modifié" -#: rhodecode/templates/summary/summary.html:670 +#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "fichier supprimé" @@ -4442,7 +4631,7 @@ msgid "%s Tags" msgstr "Tags de %s" -#: rhodecode/templates/tags/tags.html:29 +#: rhodecode/templates/tags/tags.html:26 #, fuzzy msgid "Compare tags" msgstr "Comparer"
--- a/rhodecode/i18n/how_to Fri Apr 05 14:09:23 2013 +0200 +++ b/rhodecode/i18n/how_to Fri Apr 05 19:21:52 2013 +0200 @@ -8,17 +8,17 @@ python setup.py init_catalog -l pl <- create a language directory for <pl> lang #edit the new po file with poedit or any other editor msgfmt -f -c <updated_file.po> <- check format and errors -python setup.py compile_catalog <- create translation files +python setup.py compile_catalog -l pl <- create translation files ############# # to update # ############# python setup.py extract_messages <- get messages from project -python setup.py update_catalog <- to update the translations +python setup.py update_catalog -l pl<- to update the translations #edit the new updated po file with poedit msgfmt -f -c <updated_file.po> <- check format and errors -python setup.py compile_catalog <- create translation files +python setup.py compile_catalog -l pl <- create translation files ###################
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Fri Apr 05 14:09:23 2013 +0200 +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Fri Apr 05 19:21:52 2013 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-01-28 00:24+0100\n" +"POT-Creation-Date: 2013-04-05 10:19-0700\n" "PO-Revision-Date: 2013-01-02 01:39+0900\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: ja <LL@li.org>\n" @@ -27,11 +27,13 @@ msgstr "すべてのブランチ" #: rhodecode/controllers/changeset.py:83 -msgid "show white space" +#, fuzzy +msgid "Show white space" msgstr "空白を表示" #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 -msgid "ignore white space" +#, fuzzy +msgid "Ignore white space" msgstr "空白を無視" #: rhodecode/controllers/changeset.py:163 @@ -40,7 +42,7 @@ msgstr "" #: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:416 +#: rhodecode/controllers/pullrequests.py:438 #, python-format msgid "Status change -> %s" msgstr "ステータス変更 -> %s" @@ -51,8 +53,8 @@ "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:121 +#: rhodecode/controllers/compare.py:74 +#: rhodecode/controllers/pullrequests.py:167 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "まだ変更がありません" @@ -94,107 +96,118 @@ msgstr "%s %s フィード" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:137 -#: rhodecode/templates/changeset/changeset.html:149 -#: rhodecode/templates/compare/compare_diff.html:62 -#: rhodecode/templates/compare/compare_diff.html:73 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 -#: rhodecode/templates/pullrequests/pullrequest_show.html:171 +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Changeset was too big and was cut off..." msgstr "チェンジセットが大きすぎるため、省略しました" -#: rhodecode/controllers/feed.py:92 -msgid "commited on" -msgstr "コミット" - -#: rhodecode/controllers/files.py:86 -msgid "click here to add new file" +#: rhodecode/controllers/feed.py:91 +#, fuzzy, python-format +msgid "%s committed on %s" +msgstr "%s コミット %s" + +#: rhodecode/controllers/files.py:88 +#, fuzzy +msgid "Click here to add new file" msgstr "新しいファイルを追加" -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/files.py:89 #, python-format msgid "There are no files yet %s" msgstr "まだファイルがありません %s" -#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338 +#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: rhodecode/controllers/files.py:281 +#: rhodecode/controllers/files.py:279 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:295 +#: rhodecode/controllers/files.py:293 #, fuzzy, python-format msgid "Edited file %s via RhodeCode" msgstr "RhodeCode経由で %s を変更" -#: rhodecode/controllers/files.py:311 +#: rhodecode/controllers/files.py:309 msgid "No changes" msgstr "変更点なし" -#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384 +#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390 +#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: rhodecode/controllers/files.py:350 +#: rhodecode/controllers/files.py:347 #, fuzzy msgid "Added file via RhodeCode" msgstr "RhodeCode経由で %s を追加" -#: rhodecode/controllers/files.py:370 +#: rhodecode/controllers/files.py:364 msgid "No content" msgstr "内容がありません" -#: rhodecode/controllers/files.py:374 +#: rhodecode/controllers/files.py:368 msgid "No filename" msgstr "ファイル名がありません" -#: rhodecode/controllers/files.py:416 -msgid "downloads disabled" +#: rhodecode/controllers/files.py:372 +msgid "Location must be relative path and must not contain .. in path" +msgstr "" + +#: rhodecode/controllers/files.py:420 +#, fuzzy +msgid "Downloads disabled" msgstr "ダウンロードは無効化されています" -#: rhodecode/controllers/files.py:427 +#: rhodecode/controllers/files.py:431 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: rhodecode/controllers/files.py:429 +#: rhodecode/controllers/files.py:433 msgid "Empty repository" msgstr "空のリポジトリ" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:435 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: rhodecode/controllers/files.py:576 -#: rhodecode/templates/changeset/changeset_range.html:13 -#: rhodecode/templates/changeset/changeset_range.html:31 +#: rhodecode/controllers/files.py:617 +#: rhodecode/templates/changeset/changeset_range.html:9 msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564 +#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 +#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "ブランチ" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78 -#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575 +#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 +#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "タグ" -#: rhodecode/controllers/forks.py:165 -#, python-format -msgid "forked %s repository as %s" +#: rhodecode/controllers/forks.py:175 +#, fuzzy, python-format +msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォーク" -#: rhodecode/controllers/forks.py:179 +#: rhodecode/controllers/forks.py:189 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" @@ -204,50 +217,72 @@ msgstr "公開ジャーナル" #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 -#: rhodecode/templates/base/base.html:238 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "ジャーナル" -#: rhodecode/controllers/login.py:142 -msgid "You have successfully registered into rhodecode" +#: rhodecode/controllers/login.py:138 +#, fuzzy +msgid "You have successfully registered into RhodeCode" msgstr "rhodecodeへの登録を受け付けました" -#: rhodecode/controllers/login.py:163 +#: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" msgstr "パスワードリセットのリンクを送信しました" -#: rhodecode/controllers/login.py:183 +#: rhodecode/controllers/login.py:179 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました" -#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570 +#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/email_templates/changeset_comment.html:15 +msgid "Changeset" +msgstr "チェンジセット" + +#: rhodecode/controllers/pullrequests.py:128 +msgid "Special" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:129 +#, fuzzy +msgid "Peer branches" +msgstr "ブランチ" + +#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/controllers/pullrequests.py:190 +#: rhodecode/controllers/pullrequests.py:228 msgid "Pull request requires a title with min. 3 chars" msgstr "プルリクエストには3文字以上のタイトルが必要です" -#: rhodecode/controllers/pullrequests.py:192 -msgid "error during creation of pull request" +#: rhodecode/controllers/pullrequests.py:230 +#, fuzzy +msgid "Error creating pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:224 +#: rhodecode/controllers/pullrequests.py:251 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストを作成しました" -#: rhodecode/controllers/pullrequests.py:227 +#: rhodecode/controllers/pullrequests.py:254 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:260 +#: rhodecode/controllers/pullrequests.py:287 msgid "Successfully deleted pull request" msgstr "プルリクエストを削除しました" -#: rhodecode/controllers/pullrequests.py:451 +#: rhodecode/controllers/pullrequests.py:441 +msgid "Closing with" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:478 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" @@ -263,55 +298,12 @@ msgid "An error occurred during this search operation" msgstr "検索を実行する際にエラーがおきました" -#: rhodecode/controllers/settings.py:120 -#: rhodecode/controllers/admin/repos.py:254 -#, python-format -msgid "Repository %s updated successfully" -msgstr "リポジトリ %s の更新に成功しました" - -#: rhodecode/controllers/settings.py:138 -#: rhodecode/controllers/admin/repos.py:272 -#, python-format -msgid "error occurred during update of repository %s" -msgstr "リポジトリ %s の更新中にエラーが発生しました" - -#: rhodecode/controllers/settings.py:163 -#: rhodecode/controllers/admin/repos.py:297 -#, python-format -msgid "deleted repository %s" -msgstr "リポジトリ %s を削除しました" - -#: rhodecode/controllers/settings.py:167 -#: rhodecode/controllers/admin/repos.py:307 -#: rhodecode/controllers/admin/repos.py:313 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "リポジトリ %s の削除中にエラーが発生しました" - -#: rhodecode/controllers/settings.py:186 -msgid "unlocked" -msgstr "アンロック" - -#: rhodecode/controllers/settings.py:189 -msgid "locked" -msgstr "ロック" - -#: rhodecode/controllers/settings.py:191 -#, python-format -msgid "Repository has been %s" -msgstr "リポジトリは %s されています" - -#: rhodecode/controllers/settings.py:195 -#: rhodecode/controllers/admin/repos.py:405 -msgid "An error occurred during unlocking" -msgstr "アンロック時にエラーが発生しました" - -#: rhodecode/controllers/summary.py:140 +#: rhodecode/controllers/summary.py:141 msgid "No data loaded yet" msgstr "まだデータが読み込まれていません" -#: rhodecode/controllers/summary.py:144 -#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/controllers/summary.py:147 +#: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" @@ -320,7 +312,8 @@ msgstr "デフォルト設定を更新しました" #: rhodecode/controllers/admin/defaults.py:110 -msgid "error occurred during update of defaults" +#, fuzzy +msgid "Error occurred during update of defaults" msgstr "デフォルト設定の更新中にエラーが発生しました" #: rhodecode/controllers/admin/ldap_settings.py:50 @@ -376,7 +369,8 @@ msgstr "LDAPを有効にできませんでした。\"python-ldap\"ライブラリがありません。" #: rhodecode/controllers/admin/ldap_settings.py:147 -msgid "error occurred during update of ldap settings" +#, fuzzy +msgid "Error occurred during update of ldap settings" msgstr "LDAP設定の更新中にエラーが発生しました" #: rhodecode/controllers/admin/permissions.py:60 @@ -399,45 +393,46 @@ #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 -#: rhodecode/templates/admin/repos/repo_add.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:9 +#: rhodecode/templates/admin/repos/repo_add.html:10 +#: rhodecode/templates/admin/repos/repo_add.html:14 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:133 #: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/admin/users/users.html:85 #: 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:203 -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 +#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:300 msgid "Admin" msgstr "管理" #: rhodecode/controllers/admin/permissions.py:70 -msgid "disabled" -msgstr "無効にする" - -#: rhodecode/controllers/admin/permissions.py:72 -msgid "allowed with manual account activation" -msgstr "手動でアカウントを有効にする" - -#: rhodecode/controllers/admin/permissions.py:74 -msgid "allowed with automatic account activation" -msgstr "自動でアカウントを有効にする" - #: rhodecode/controllers/admin/permissions.py:76 #: rhodecode/controllers/admin/permissions.py:79 msgid "Disabled" msgstr "無効" +#: rhodecode/controllers/admin/permissions.py:72 +#, fuzzy +msgid "Allowed with manual account activation" +msgstr "手動でアカウントを有効にする" + +#: rhodecode/controllers/admin/permissions.py:74 +#, fuzzy +msgid "Allowed with automatic account activation" +msgstr "自動でアカウントを有効にする" + #: rhodecode/controllers/admin/permissions.py:77 #: rhodecode/controllers/admin/permissions.py:80 msgid "Enabled" @@ -448,154 +443,231 @@ msgstr "デフォルトの権限を更新しました" #: rhodecode/controllers/admin/permissions.py:142 -msgid "error occurred during update of permissions" +#, fuzzy +msgid "Error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:127 msgid "--REMOVE FORK--" msgstr "--フォーク元を削除--" -#: rhodecode/controllers/admin/repos.py:162 -#, python-format -msgid "created repository %s from %s" +#: rhodecode/controllers/admin/repos.py:168 +#, fuzzy, python-format +msgid "Created repository %s from %s" msgstr "リポジトリ %s を %s から作成" -#: rhodecode/controllers/admin/repos.py:166 -#, python-format -msgid "created repository %s" +#: rhodecode/controllers/admin/repos.py:174 +#, fuzzy, python-format +msgid "Created repository %s" msgstr "リポジトリ %s を作成しました" #: rhodecode/controllers/admin/repos.py:197 +#, fuzzy, python-format +msgid "Error creating repository %s" +msgstr "リポジトリ %s を作成しました" + +#: rhodecode/controllers/admin/repos.py:266 #, python-format -msgid "error occurred during creation of repository %s" -msgstr "リポジトリ %s を作成中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:302 +msgid "Repository %s updated successfully" +msgstr "リポジトリ %s の更新に成功しました" + +#: rhodecode/controllers/admin/repos.py:284 +#, fuzzy, python-format +msgid "Error occurred during update of repository %s" +msgstr "リポジトリ %s の更新中にエラーが発生しました" + +#: rhodecode/controllers/admin/repos.py:311 +#: rhodecode/controllers/api/api.py:877 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/api/api.py:879 +#, fuzzy, python-format +msgid "Deleted %s forks" +msgstr "リポジトリ %s を削除しました" + +#: rhodecode/controllers/admin/repos.py:319 +#, fuzzy, python-format +msgid "Deleted repository %s" +msgstr "リポジトリ %s を削除しました" + +#: rhodecode/controllers/admin/repos.py:322 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "フォークしたリポジトリが存在するため、 %s は削除できません" -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:327 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "リポジトリ %s の削除中にエラーが発生しました" + +#: rhodecode/controllers/admin/repos.py:365 +#, fuzzy +msgid "Repository permissions updated" +msgstr "ユーザーの 'リポジトリフォーク' 権限を取り消しました" + +#: rhodecode/controllers/admin/repos.py:384 msgid "An error occurred during deletion of repository user" msgstr "リポジトリユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:350 -msgid "An error occurred during deletion of repository users groups" +#: rhodecode/controllers/admin/repos.py:403 +#, fuzzy +msgid "An error occurred during deletion of repository user groups" msgstr "リポジトリユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:421 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:438 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化時にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:425 +#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:485 +msgid "An error occurred during unlocking" +msgstr "アンロック時にエラーが発生しました" + +#: rhodecode/controllers/admin/repos.py:476 +#, fuzzy +msgid "Unlocked" +msgstr "アンロック" + +#: rhodecode/controllers/admin/repos.py:479 +#, fuzzy +msgid "Locked" +msgstr "ロック" + +#: rhodecode/controllers/admin/repos.py:481 +#, python-format +msgid "Repository has been %s" +msgstr "リポジトリは %s されています" + +#: rhodecode/controllers/admin/repos.py:505 msgid "Updated repository visibility in public journal" msgstr "公開ジャーナルでのリポジトリの可視性を更新しました" -#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:509 msgid "An error occurred during setting this repository in public journal" msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301 +#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "トークンが合いません" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:527 msgid "Pulled from remote location" msgstr "リモートから取得" -#: rhodecode/controllers/admin/repos.py:449 +#: rhodecode/controllers/admin/repos.py:529 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:545 msgid "Nothing" msgstr "ありません" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:547 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとして印をつける" -#: rhodecode/controllers/admin/repos.py:471 +#: rhodecode/controllers/admin/repos.py:551 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:136 -#, python-format -msgid "created repos group %s" +#: rhodecode/controllers/admin/repos.py:590 +#, fuzzy +msgid "An error occurred during creation of field" +msgstr "ユーザー %s の作成中にエラーが発生しました" + +#: rhodecode/controllers/admin/repos.py:604 +#, fuzzy +msgid "An error occurred during removal of field" +msgstr "メールの保存時にエラーが発生しました" + +#: rhodecode/controllers/admin/repos_groups.py:145 +#, fuzzy, python-format +msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: rhodecode/controllers/admin/repos_groups.py:148 -#, python-format -msgid "error occurred during creation of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:157 +#, fuzzy, python-format +msgid "Error occurred during creation of repository group %s" msgstr "リポジトリグループ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:205 -#, python-format -msgid "updated repos group %s" -msgstr "リポジトリグループ %s を更新しました" +#: rhodecode/controllers/admin/repos_groups.py:214 +#: rhodecode/controllers/admin/repos_groups.py:286 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:220 -#, python-format -msgid "error occurred during update of repos group %s" +#, fuzzy, python-format +msgid "Updated repository group %s" +msgstr "リポジトリグループ %s を更新しました" + +#: rhodecode/controllers/admin/repos_groups.py:235 +#, fuzzy, python-format +msgid "Error occurred during update of repository group %s" msgstr "リポジトリグループ %s を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:253 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "このグループは %s リポジトリを含んでいるため削除出来ません" -#: rhodecode/controllers/admin/repos_groups.py:246 -#, python-format -msgid "removed repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:260 +#, fuzzy, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "このグループは %s リポジトリを含んでいるため削除出来ません" + +#: rhodecode/controllers/admin/repos_groups.py:266 +#, fuzzy, python-format +msgid "Removed repository group %s" msgstr "リポジトリグループ %s を削除しました" -#: rhodecode/controllers/admin/repos_groups.py:252 -msgid "Cannot delete this group it still contains subgroups" -msgstr "サブグループを含んでいるため、このグループを削除できません" - -#: rhodecode/controllers/admin/repos_groups.py:257 -#: rhodecode/controllers/admin/repos_groups.py:262 -#, python-format -msgid "error occurred during deletion of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:271 +#, fuzzy, python-format +msgid "Error occurred during deletion of repos group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:283 +#: rhodecode/controllers/admin/repos_groups.py:297 msgid "An error occurred during deletion of group user" msgstr "グループユーザーを削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:304 -msgid "An error occurred during deletion of group users groups" +#: rhodecode/controllers/admin/repos_groups.py:318 +#, fuzzy +msgid "An error occurred during deletion of group user groups" msgstr "グループユーザーのグループを削除中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:124 +#: rhodecode/controllers/admin/settings.py:126 #, fuzzy, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "リポジトリを再度スキャンしました。 追加: %s 削除: %s" -#: rhodecode/controllers/admin/settings.py:133 +#: rhodecode/controllers/admin/settings.py:135 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" -#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:166 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:170 #: rhodecode/controllers/admin/settings.py:301 -msgid "error occurred during updating application settings" +#, fuzzy +msgid "Error occurred during updating application settings" msgstr "アプリケーション設定を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:209 +#: rhodecode/controllers/admin/settings.py:216 msgid "Updated visualisation settings" msgstr "表示の設定を更新しました" -#: rhodecode/controllers/admin/settings.py:214 -msgid "error occurred during updating visualisation settings" +#: rhodecode/controllers/admin/settings.py:221 +#, fuzzy +msgid "Error occurred during updating visualisation settings" msgstr "表示の設定を更新中にエラーが発生しました" #: rhodecode/controllers/admin/settings.py:297 @@ -611,35 +683,36 @@ msgstr "フックを更新しました" #: rhodecode/controllers/admin/settings.py:327 -msgid "error occurred during hook creation" +#, fuzzy +msgid "Error occurred during hook creation" msgstr "フックの作成時にエラーが発生しました" #: rhodecode/controllers/admin/settings.py:346 msgid "Email task created" msgstr "メールのタスクを作成しました" -#: rhodecode/controllers/admin/settings.py:408 +#: rhodecode/controllers/admin/settings.py:410 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/controllers/admin/settings.py:448 +#: rhodecode/controllers/admin/settings.py:452 msgid "Your account was updated successfully" msgstr "アカウントを更新しました" -#: rhodecode/controllers/admin/settings.py:463 +#: rhodecode/controllers/admin/settings.py:467 #: rhodecode/controllers/admin/users.py:198 -#, python-format -msgid "error occurred during update of user %s" +#, fuzzy, python-format +msgid "Error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" #: rhodecode/controllers/admin/users.py:130 -#, python-format -msgid "created user %s" +#, fuzzy, python-format +msgid "Created user %s" msgstr "ユーザー %s を作成しました" #: rhodecode/controllers/admin/users.py:142 -#, python-format -msgid "error occurred during creation of user %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" #: rhodecode/controllers/admin/users.py:176 @@ -647,7 +720,8 @@ msgstr "ユーザーの更新に成功しました" #: rhodecode/controllers/admin/users.py:214 -msgid "successfully deleted user" +#, fuzzy +msgid "Successfully deleted user" msgstr "ユーザーの削除に成功しました" #: rhodecode/controllers/admin/users.py:219 @@ -675,7 +749,7 @@ msgstr "ユーザーの 'リポジトリフォーク' 権限を取り消しました" #: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:279 +#: rhodecode/controllers/admin/users_groups.py:281 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" @@ -708,221 +782,229 @@ msgstr "ユーザーからメールを削除しました" #: rhodecode/controllers/admin/users_groups.py:86 -#, python-format -msgid "created users group %s" +#, fuzzy, python-format +msgid "Created user group %s" msgstr "ユーザーグループ %s を作成しました" #: rhodecode/controllers/admin/users_groups.py:97 -#, python-format -msgid "error occurred during creation of users group %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:164 -#, python-format -msgid "updated users group %s" +#: rhodecode/controllers/admin/users_groups.py:166 +#, fuzzy, python-format +msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: rhodecode/controllers/admin/users_groups.py:186 -#, python-format -msgid "error occurred during update of users group %s" +#: rhodecode/controllers/admin/users_groups.py:188 +#, fuzzy, python-format +msgid "Error occurred during update of user group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:203 -msgid "successfully deleted users group" +#: rhodecode/controllers/admin/users_groups.py:205 +#, fuzzy +msgid "Successfully deleted user group" msgstr "ユーザーグループ" -#: rhodecode/controllers/admin/users_groups.py:208 -msgid "An error occurred during deletion of users group" +#: rhodecode/controllers/admin/users_groups.py:210 +#, fuzzy +msgid "An error occurred during deletion of user group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:257 -msgid "Granted 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:259 +#, fuzzy +msgid "Granted 'repository create' permission to user group" msgstr "ユーザーグループに 'リポジトリ作成' 権限を与えました" -#: rhodecode/controllers/admin/users_groups.py:262 -msgid "Revoked 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:264 +#, fuzzy +msgid "Revoked 'repository create' permission to user group" msgstr "ユーザーグループの 'リポジトリ作成' 権限を取り消しました" -#: rhodecode/controllers/admin/users_groups.py:268 -msgid "Granted 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:270 +#, fuzzy +msgid "Granted 'repository fork' permission to user group" msgstr "ユーザーグループに 'リポジトリフォーク' 権限を与えました" -#: rhodecode/controllers/admin/users_groups.py:273 -msgid "Revoked 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:275 +#, fuzzy +msgid "Revoked 'repository fork' permission to user group" msgstr "ユーザーグループの 'リポジトリフォーク' 権限を取り消しました" -#: rhodecode/lib/auth.py:509 +#: rhodecode/lib/auth.py:530 #, fuzzy, python-format msgid "IP %s not allowed" msgstr "%s フォロワー" -#: rhodecode/lib/auth.py:558 +#: rhodecode/lib/auth.py:579 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録ユーザーである必要があります" -#: rhodecode/lib/auth.py:599 +#: rhodecode/lib/auth.py:620 msgid "You need to be a signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" -#: rhodecode/lib/diffs.py:74 -msgid "binary file" +#: rhodecode/lib/diffs.py:66 +#, fuzzy +msgid "Binary file" msgstr "バイナリファイル" -#: rhodecode/lib/diffs.py:90 +#: rhodecode/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください" -#: rhodecode/lib/diffs.py:100 +#: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "検出された変更はありません" -#: rhodecode/lib/helpers.py:374 +#: rhodecode/lib/helpers.py:394 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%a, %d %b %Y %H:%M:%S" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:506 msgid "True" msgstr "True" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:509 msgid "False" msgstr "False" -#: rhodecode/lib/helpers.py:530 +#: rhodecode/lib/helpers.py:547 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: rhodecode/lib/helpers.py:533 +#: rhodecode/lib/helpers.py:550 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:563 msgid "Changeset not found" msgstr "リビジョンが見つかりません" -#: rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:621 msgid "compare view" msgstr "比較の表示" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:641 msgid "and" msgstr "と" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:642 #, python-format msgid "%s more" msgstr "%s 以上" -#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 msgid "revisions" msgstr "リビジョン" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:667 #, python-format msgid "fork name %s" msgstr "フォーク名 %s" -#: rhodecode/lib/helpers.py:658 -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/lib/helpers.py:684 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "プルリクエスト #%s" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:690 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 +#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:694 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 +#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 +#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: rhodecode/lib/helpers.py:674 +#: rhodecode/lib/helpers.py:700 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:682 +#: rhodecode/lib/helpers.py:708 msgid "[created] user" msgstr "ユーザーを[作成]" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:710 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: rhodecode/lib/helpers.py:686 -msgid "[created] users group" +#: rhodecode/lib/helpers.py:712 +#, fuzzy +msgid "[created] user group" msgstr "ユーザーグループを[作成]" -#: rhodecode/lib/helpers.py:688 -msgid "[updated] users group" +#: rhodecode/lib/helpers.py:714 +#, fuzzy +msgid "[updated] user group" msgstr "ユーザーグループを[更新]" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:716 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: rhodecode/lib/helpers.py:692 +#: rhodecode/lib/helpers.py:718 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:720 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: rhodecode/lib/helpers.py:696 +#: rhodecode/lib/helpers.py:722 msgid "[pushed] into" msgstr "[プッシュ]" -#: rhodecode/lib/helpers.py:698 +#: rhodecode/lib/helpers.py:724 msgid "[committed via RhodeCode] into repository" msgstr "リポジトリに[RhodeCode経由でコミット]" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:726 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:728 msgid "[pulled] from" msgstr "[プル]" -#: rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:730 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:732 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/helpers.py:884 +#: rhodecode/lib/helpers.py:910 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:888 +#: rhodecode/lib/helpers.py:914 msgid "No Files" msgstr "ファイルなし" -#: rhodecode/lib/helpers.py:1164 +#: rhodecode/lib/helpers.py:1198 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -932,179 +1014,224 @@ "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/lib/utils2.py:403 +#: rhodecode/lib/unionrepo.py:193 +#, fuzzy +msgid "cannot create new union repository" +msgstr "リポジトリを[作成]" + +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: rhodecode/lib/utils2.py:404 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: rhodecode/lib/utils2.py:405 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: rhodecode/lib/utils2.py:406 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: rhodecode/lib/utils2.py:407 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: rhodecode/lib/utils2.py:408 +#: rhodecode/lib/utils2.py:416 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: rhodecode/lib/utils2.py:424 +#: rhodecode/lib/utils2.py:432 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:426 +#: rhodecode/lib/utils2.py:434 #, python-format msgid "%s ago" msgstr "%s 前" -#: rhodecode/lib/utils2.py:428 +#: rhodecode/lib/utils2.py:436 #, python-format msgid "in %s and %s" msgstr "" -#: rhodecode/lib/utils2.py:431 +#: rhodecode/lib/utils2.py:439 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:442 msgid "just now" msgstr "ちょうどいま" -#: rhodecode/lib/celerylib/tasks.py:270 -msgid "password reset link" -msgstr "パスワードリセットのリンク" - #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 msgid "Repository no access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 msgid "Repository read access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 msgid "Repository write access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 msgid "Repository admin access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 msgid "Repositories Group no access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 msgid "Repositories Group read access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 msgid "Repositories Group write access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 msgid "Repositories Group admin access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 msgid "RhodeCode Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 msgid "Repository creation disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 msgid "Repository creation enabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 msgid "Repository forking disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 msgid "Repository forking enabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 msgid "Register disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 msgid "Not Reviewed" msgstr "未レビュー" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 msgid "Approved" msgstr "承認" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 msgid "Rejected" msgstr "却下" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 msgid "Under Review" msgstr "レビュー中" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:176 +#: rhodecode/model/comment.py:219 msgid "[Mention]" msgstr "[Mention]" +#: rhodecode/model/db.py:1252 +msgid "top level" +msgstr "" + +#: rhodecode/model/db.py:1393 +#, fuzzy +msgid "Repository group no access" +msgstr "リポジトリグループ" + +#: rhodecode/model/db.py:1394 +#, fuzzy +msgid "Repository group read access" +msgstr "リポジトリグループ" + +#: rhodecode/model/db.py:1395 +#, fuzzy +msgid "Repository group write access" +msgstr "リポジトリグループ" + +#: rhodecode/model/db.py:1396 +#, fuzzy +msgid "Repository group admin access" +msgstr "リポジトリグループ" + #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "ログイン名を入力してください" @@ -1123,219 +1250,247 @@ msgid "Enter %(min)i characters or more" msgstr "%(min)i 文字以上必要です" -#: rhodecode/model/notification.py:220 -#, python-format -msgid "commented on commit at %(when)s" -msgstr "コミットにコメント %(when)s" - -#: rhodecode/model/notification.py:221 -#, python-format -msgid "sent message at %(when)s" -msgstr "メッセージを送信 %(when)s" - -#: rhodecode/model/notification.py:222 -#, python-format -msgid "mentioned you at %(when)s" -msgstr "Mention %(when)s" - -#: rhodecode/model/notification.py:223 -#, python-format -msgid "registered in RhodeCode at %(when)s" -msgstr "RhodeCodeに登録 %(when)s" - #: rhodecode/model/notification.py:224 -#, python-format -msgid "opened new pull request at %(when)s" -msgstr "新しいプルリクエストを作成 %(when)s" +#, fuzzy, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "%(user)s コミットにコメント %(when)s" #: rhodecode/model/notification.py:225 -#, python-format -msgid "commented on pull request at %(when)s" -msgstr "プルリクエストにコメント %(when)s" - -#: rhodecode/model/pull_request.py:100 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_id)s" -msgstr "%(user)s がプリリクエスト #%(pr_id)s のレビューを求めています" - -#: rhodecode/model/scm.py:556 +#, fuzzy, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "%(user)s メッセージを送信 %(when)s" + +#: rhodecode/model/notification.py:226 +#, fuzzy, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "%(user)s mentioned you at %(when)s" + +#: rhodecode/model/notification.py:227 +#, fuzzy, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "%(user)s RhodeCodeに登録 %(when)s" + +#: rhodecode/model/notification.py:228 +#, fuzzy, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "%(user)s 新しいプルリクエストを作成 %(when)s" + +#: rhodecode/model/notification.py:229 +#, fuzzy, python-format +msgid "%(user)s commented on pull request at %(when)s" +msgstr "%(user)s プルリクエストにコメント %(when)s" + +#: rhodecode/model/pull_request.py:104 +#, fuzzy, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" +msgstr "%(user)s がプリリクエスト #%(pr_id)s のレビューを求めています %(pr_title)s" + +#: rhodecode/model/scm.py:598 msgid "latest tip" msgstr "最新のtip" -#: rhodecode/model/user.py:231 -msgid "new user registration" +#: rhodecode/model/user.py:232 +#, fuzzy +msgid "New user registration" msgstr "新規ユーザー登録" -#: rhodecode/model/user.py:256 rhodecode/model/user.py:280 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" msgstr "アプリケーション全体にとって重要なユーザなため、編集出来ません" -#: rhodecode/model/user.py:302 +#: rhodecode/model/user.py:303 msgid "You can't remove this user since it's crucial for entire application" msgstr "アプリケーション全体にとって重要なユーザなため、削除できません" -#: rhodecode/model/user.py:308 +#: rhodecode/model/user.py:309 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38 +#: rhodecode/model/user.py:334 +#, fuzzy +msgid "Password reset link" +msgstr "パスワードリセットのリンク" + +#: rhodecode/model/user.py:366 +#, fuzzy +msgid "Your new password" +msgstr "新しいパスワード" + +#: rhodecode/model/user.py:367 +#, python-format +msgid "Your new RhodeCode password:%s" +msgstr "" + +#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" msgstr "空のリストには出来ません" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "ユーザー名 \"%(username)s\" はすでに使われています" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "ユーザー名 \"%(username)s\" は許可されていません" -#: rhodecode/model/validators.py:88 +#: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" -#: rhodecode/model/validators.py:116 +#: rhodecode/model/validators.py:117 #, python-format msgid "Username %(username)s is not valid" msgstr "ユーザー名 %(username)s は不正です" -#: rhodecode/model/validators.py:135 -msgid "Invalid users group name" +#: rhodecode/model/validators.py:136 +#, fuzzy +msgid "Invalid user group name" msgstr "不正なユーザーグループ名です" -#: rhodecode/model/validators.py:136 -#, python-format -msgid "Users group \"%(usersgroup)s\" already exists" -msgstr "ユーザーグループ \"%(usersgroup)s\" はすでに存在します" - -#: rhodecode/model/validators.py:138 +#: rhodecode/model/validators.py:137 +#, fuzzy, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "ユーザーグループ \"%(usergroup)s\" はすでに存在します" + +#: rhodecode/model/validators.py:139 +#, fuzzy msgid "" -"users group name may only contain alphanumeric characters underscores, " +"user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" " " -#: rhodecode/model/validators.py:176 +#: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" msgstr "このグループは親にできません" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "グループ \"%(group_name)s\" はすでに存在します" -#: rhodecode/model/validators.py:179 +#: rhodecode/model/validators.py:180 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:238 msgid "Invalid characters (non-ascii) in password" msgstr "パスワードに利用出来ない文字列(non-ascii)です" -#: rhodecode/model/validators.py:252 +#: rhodecode/model/validators.py:253 msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: rhodecode/model/validators.py:269 +#: rhodecode/model/validators.py:270 msgid "invalid password" msgstr "不正なパスワードです" -#: rhodecode/model/validators.py:270 +#: rhodecode/model/validators.py:271 msgid "invalid user name" msgstr "不正なユーザー名です" -#: rhodecode/model/validators.py:271 +#: rhodecode/model/validators.py:272 msgid "Your account is disabled" msgstr "アカウントは無効です" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "リポジトリ名 %(repo)s は許可されていません" -#: rhodecode/model/validators.py:317 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "リポジトリ %(repo)s はすでに存在します" - #: rhodecode/model/validators.py:318 #, python-format +msgid "Repository named %(repo)s already exists" +msgstr "リポジトリ %(repo)s はすでに存在します" + +#: rhodecode/model/validators.py:319 +#, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" -#: rhodecode/model/validators.py:320 -#, python-format -msgid "Repositories group with name \"%(repo)s\" already exists" +#: rhodecode/model/validators.py:321 +#, fuzzy, python-format +msgid "Repository group with name \"%(repo)s\" already exists" msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します" -#: rhodecode/model/validators.py:433 +#: rhodecode/model/validators.py:438 msgid "invalid clone url" msgstr "無効なクローンURIです" -#: rhodecode/model/validators.py:434 +#: rhodecode/model/validators.py:439 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "無効なクローンURIです。有効な http(s)/svn+http(s) のURIを指定してください" -#: rhodecode/model/validators.py:459 +#: rhodecode/model/validators.py:464 msgid "Fork have to be the same type as parent" msgstr "フォークは親と同じタイプの必要があります" -#: rhodecode/model/validators.py:474 +#: rhodecode/model/validators.py:479 msgid "You don't have permissions to create repository in this group" msgstr "このグループでリポジトリを作成する権限がありません" -#: rhodecode/model/validators.py:501 +#: rhodecode/model/validators.py:481 +#, fuzzy +msgid "no permission to create repository in root location" +msgstr "このグループでリポジトリを作成する権限がありません" + +#: rhodecode/model/validators.py:518 #, fuzzy msgid "You don't have permissions to create a group in this location" msgstr "このグループでリポジトリを作成する権限がありません" -#: rhodecode/model/validators.py:540 -msgid "This username or users group name is not valid" +#: rhodecode/model/validators.py:557 +#, fuzzy +msgid "This username or user group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: rhodecode/model/validators.py:636 +#: rhodecode/model/validators.py:650 msgid "This is not a valid path" msgstr "不正なパスです" -#: rhodecode/model/validators.py:651 +#: rhodecode/model/validators.py:665 msgid "This e-mail address is already taken" msgstr "このメールアドレスはすでに取得されています" -#: rhodecode/model/validators.py:671 +#: rhodecode/model/validators.py:685 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "メールアドレス \"%(email)s\" は存在しません" -#: rhodecode/model/validators.py:708 +#: rhodecode/model/validators.py:722 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです" -#: rhodecode/model/validators.py:727 +#: rhodecode/model/validators.py:735 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:759 +#: rhodecode/model/validators.py:767 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:760 +#: rhodecode/model/validators.py:768 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/templates/index.html:3 +#: rhodecode/model/validators.py:800 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "ダッシュボード" @@ -1344,223 +1499,229 @@ #: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/bookmarks/bookmarks.html:9 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:9 -#: rhodecode/templates/journal/journal.html:49 -#: rhodecode/templates/journal/journal.html:50 -#: rhodecode/templates/tags/tags.html:10 +#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:47 +#: rhodecode/templates/tags/tags.html:9 msgid "quick filter..." msgstr "クイックフィルタ..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:239 msgid "repositories" msgstr "リポジトリ" -#: rhodecode/templates/index_base.html:14 -#: rhodecode/templates/index_base.html:17 +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 #: rhodecode/templates/admin/repos/repos.html:21 msgid "Add repository" msgstr "リポジトリの追加" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/index_base.html:20 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 +#, fuzzy +msgid "Add group" +msgstr "リポジトリグループを編集" + +#: rhodecode/templates/index_base.html:27 #, fuzzy msgid "Edit group" msgstr "リポジトリグループを編集" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:36 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "Group name" msgstr "グループ名" -#: rhodecode/templates/index_base.html:37 -#: rhodecode/templates/index_base.html:79 +#: rhodecode/templates/index_base.html:41 +#: rhodecode/templates/index_base.html:83 #: rhodecode/templates/index_base.html:142 #: rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:270 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:73 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/forks/fork.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "説明" -#: rhodecode/templates/index_base.html:47 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 -msgid "Repositories group" +#: rhodecode/templates/index_base.html:51 +#: rhodecode/templates/admin/permissions/permissions.html:55 +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 +#: rhodecode/templates/forks/fork.html:47 +msgid "Repository group" msgstr "リポジトリグループ" -#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:82 #: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:271 -#: rhodecode/templates/admin/permissions/permissions.html:117 +#: rhodecode/templates/index_base.html:268 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:71 -#: rhodecode/templates/admin/users/user_edit.html:200 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:211 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 -#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/admin/users/user_edit_my_account.html:172 +#: rhodecode/templates/base/perms_summary.html:14 +#: rhodecode/templates/bookmarks/bookmarks.html:34 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:201 -#: rhodecode/templates/journal/journal.html:305 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:132 -#: rhodecode/templates/tags/tags.html:51 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/summary/summary.html:55 +#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/tags/tags.html:48 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名前" -#: rhodecode/templates/index_base.html:80 +#: rhodecode/templates/index_base.html:84 msgid "Last change" msgstr "最後の変更時刻" -#: rhodecode/templates/index_base.html:81 +#: rhodecode/templates/index_base.html:85 #: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:276 +#: rhodecode/templates/index_base.html:273 #: rhodecode/templates/admin/repos/repos.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:213 -#: rhodecode/templates/journal/journal.html:203 -#: rhodecode/templates/journal/journal.html:307 +#: rhodecode/templates/admin/users/user_edit_my_account.html:174 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:298 msgid "Tip" msgstr "Tip" -#: rhodecode/templates/index_base.html:82 +#: rhodecode/templates/index_base.html:86 #: rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:278 +#: rhodecode/templates/index_base.html:275 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "RSS" - -#: rhodecode/templates/index_base.html:84 +#: rhodecode/templates/index_base.html:87 msgid "Atom" msgstr "Atom" #: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:296 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:235 +#: rhodecode/templates/admin/users/user_edit_my_account.html:196 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:225 -#: rhodecode/templates/journal/journal.html:329 -#: rhodecode/templates/tags/tags.html:77 +#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/branches/branches.html:73 +#: rhodecode/templates/journal/journal.html:217 +#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "昇順で並び換え" #: rhodecode/templates/index_base.html:172 -#: rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:301 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:297 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:236 +#: rhodecode/templates/admin/users/user_edit_my_account.html:197 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:226 -#: rhodecode/templates/journal/journal.html:330 -#: rhodecode/templates/tags/tags.html:78 +#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/branches/branches.html:74 +#: rhodecode/templates/journal/journal.html:218 +#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "降順で並び替え" #: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:274 +#: rhodecode/templates/index_base.html:271 msgid "Last Change" msgstr "最後の変更点" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:302 +#: rhodecode/templates/index_base.html:211 #: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:237 +#: rhodecode/templates/admin/users/user_edit_my_account.html:198 #: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:227 -#: rhodecode/templates/journal/journal.html:331 -#: rhodecode/templates/tags/tags.html:79 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:219 +#: rhodecode/templates/journal/journal.html:322 +#: rhodecode/templates/tags/tags.html:76 msgid "No records found." msgstr "レコードが見つかりません" -#: rhodecode/templates/index_base.html:214 -#: rhodecode/templates/index_base.html:303 +#: rhodecode/templates/index_base.html:212 +#: rhodecode/templates/index_base.html:299 #: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:238 +#: rhodecode/templates/admin/users/user_edit_my_account.html:199 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:228 -#: rhodecode/templates/journal/journal.html:332 -#: rhodecode/templates/tags/tags.html:80 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:220 +#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "データエラー" -#: rhodecode/templates/index_base.html:215 -#: rhodecode/templates/index_base.html:304 +#: rhodecode/templates/index_base.html:213 +#: rhodecode/templates/index_base.html:300 #: rhodecode/templates/admin/repos/repos.html:101 -#: rhodecode/templates/admin/users/user_edit_my_account.html:105 -#: rhodecode/templates/admin/users/user_edit_my_account.html:239 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +#: rhodecode/templates/admin/users/user_edit_my_account.html:200 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:229 -#: rhodecode/templates/journal/journal.html:333 -#: rhodecode/templates/tags/tags.html:81 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:221 +#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "読み込み中..." -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 -msgid "Sign In" -msgstr "サインイン" +#: rhodecode/templates/index_base.html:298 +#, fuzzy +msgid "No repositories found." +msgstr "リポジトリグループ" + +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +msgid "Log In" +msgstr "ログイン" #: rhodecode/templates/login.html:21 -msgid "Sign In to" +#, python-format +msgid "Log In to %s" msgstr "" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:54 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:89 -#: rhodecode/templates/summary/summary.html:131 +#: rhodecode/templates/admin/users/user_edit.html:57 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 +#: rhodecode/templates/admin/users/users.html:77 +#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "ユーザー名" #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:98 +#: rhodecode/templates/base/base.html:212 msgid "Password" msgstr "パスワード" @@ -1568,17 +1729,22 @@ msgid "Remember me" msgstr "次回から自動的にサインイン" +#: rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "サインイン" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "パスワードを忘れた場合はこちら" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 msgid "Don't have an account ?" msgstr "アカウントを持っていない場合はこちら" #: rhodecode/templates/password_reset.html:5 -msgid "Reset your password" -msgstr "パスワードリセット" +#, fuzzy +msgid "Password Reset" +msgstr "パスワードリセットのリンク" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1610,23 +1776,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57 +#: rhodecode/templates/admin/users/user_edit.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "First Name" msgstr "名前" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:103 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66 +#: rhodecode/templates/admin/users/user_edit.html:106 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 msgid "Last Name" msgstr "名字" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75 -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/admin/users/user_edit.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/summary/summary.html:125 msgid "Email" msgstr "メールアドレス" @@ -1638,44 +1804,31 @@ msgid "Your account must wait for activation by administrator" msgstr "アカウントは管理者のアクティベーションを待つ必要があります" -#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:76 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/summary/summary.html:77 msgid "Private repository" msgstr "非公開リポジトリ" -#: rhodecode/templates/repo_switcher_list.html:16 +#: rhodecode/templates/repo_switcher_list.html:12 +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/summary/summary.html:79 msgid "Public repository" msgstr "公開リポジトリ" -#: rhodecode/templates/switch_to_list.html:3 -#: rhodecode/templates/branches/branches.html:14 -msgid "branches" -msgstr "ブランチ" - #: rhodecode/templates/switch_to_list.html:10 #: rhodecode/templates/branches/branches_data.html:57 msgid "There are no branches yet" msgstr "まだブランチがありません" -#: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:15 -msgid "tags" -msgstr "タグ" - #: rhodecode/templates/switch_to_list.html:22 #: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "まだタグがありません" -#: rhodecode/templates/switch_to_list.html:28 -#: rhodecode/templates/bookmarks/bookmarks.html:15 -msgid "bookmarks" -msgstr "ブックマーク" - #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 msgid "There are no bookmarks yet" @@ -1683,6 +1836,7 @@ #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/base/base.html:68 msgid "Admin journal" msgstr "管理者ジャーナル" @@ -1704,9 +1858,12 @@ #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account.html:215 -#: rhodecode/templates/journal/journal.html:205 -#: rhodecode/templates/journal/journal.html:309 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:87 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:300 msgid "Action" msgstr "アクション" @@ -1716,11 +1873,11 @@ msgstr "リポジトリ" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/tags/tags.html:52 +#: rhodecode/templates/tags/tags.html:49 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "日時" @@ -1739,6 +1896,7 @@ msgstr "リポジトリのデフォルト設定" #: rhodecode/templates/admin/defaults/defaults.html:11 +#: rhodecode/templates/base/base.html:75 msgid "Defaults" msgstr "デフォルト設定" @@ -1751,8 +1909,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 +#: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1780,7 +1937,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 msgid "Enable locking" msgstr "ロックを有効にする" @@ -1792,14 +1949,17 @@ #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 #: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:148 +#: rhodecode/templates/admin/repos/repo_edit.html:173 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:137 -#: rhodecode/templates/admin/users/user_edit.html:182 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users/user_edit.html:140 +#: rhodecode/templates/admin/users/user_edit.html:185 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "保存" @@ -1808,7 +1968,10 @@ msgstr "LDAP管理" #: rhodecode/templates/admin/ldap/ldap.html:11 -msgid "Ldap" +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:74 +#, fuzzy +msgid "LDAP" msgstr "LDAP" #: rhodecode/templates/admin/ldap/ldap.html:28 @@ -1889,8 +2052,7 @@ msgstr "コメント" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 msgid "Pull requests" msgstr "プルリクエスト" @@ -1908,6 +2070,7 @@ msgstr "通知を表示" #: rhodecode/templates/admin/notifications/show_notification.html:9 +#: rhodecode/templates/base/base.html:241 msgid "Notifications" msgstr "通知" @@ -1916,11 +2079,12 @@ msgstr "権限管理" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63 -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:165 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/users/user_edit.html:150 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:86 +#: rhodecode/templates/base/base.html:73 msgid "Permissions" msgstr "権限設定" @@ -1934,30 +2098,22 @@ #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" -"All default permissions on each repository will be reset to choosen " +"All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -msgid "overwrite existing settings" +#, fuzzy +msgid "Overwrite existing settings" msgstr "現在の設定を上書きする" -#: rhodecode/templates/admin/permissions/permissions.html:55 -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" -msgstr "リポジトリグループ" - #: rhodecode/templates/admin/permissions/permissions.html:62 msgid "" -"All default permissions on each repository group will be reset to choosen" -" permission, note that all custom default permission on repositories " -"group will be lost" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 @@ -1973,22 +2129,23 @@ msgstr "リポジトリフォーク" #: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:209 -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:179 -#: rhodecode/templates/admin/settings/settings.html:269 -#: rhodecode/templates/admin/users/user_edit.html:138 -#: rhodecode/templates/admin/users/user_edit.html:183 -#: rhodecode/templates/admin/users/user_edit.html:286 -#: rhodecode/templates/admin/users/user_edit.html:334 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84 +#: rhodecode/templates/admin/permissions/permissions.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:149 +#: rhodecode/templates/admin/repos/repo_edit.html:174 +#: rhodecode/templates/admin/repos/repo_edit.html:388 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:278 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users/user_edit.html:283 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:95 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:110 msgid "Reset" msgstr "リセット" @@ -1997,106 +2154,73 @@ msgid "Default User Permissions" msgstr "デフォルトの権限" -#: rhodecode/templates/admin/permissions/permissions.html:111 -#: rhodecode/templates/admin/users/user_edit.html:194 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -msgid "Nothing here yet" -msgstr "まだありません" - -#: rhodecode/templates/admin/permissions/permissions.html:118 -#: rhodecode/templates/admin/users/user_edit.html:201 -#: rhodecode/templates/admin/users/user_edit_my_account.html:61 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 -msgid "Permission" -msgstr "権限" - -#: rhodecode/templates/admin/permissions/permissions.html:119 -#: rhodecode/templates/admin/users/user_edit.html:202 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 -msgid "Edit Permission" -msgstr "権限の編集" - -#: rhodecode/templates/admin/permissions/permissions.html:149 -#: rhodecode/templates/admin/permissions/permissions.html:151 -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:232 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:116 -#: rhodecode/templates/data_table/_dt_elements.html:117 -msgid "edit" -msgstr "編集" - -#: rhodecode/templates/admin/permissions/permissions.html:168 -#: rhodecode/templates/admin/users/user_edit.html:295 +#: rhodecode/templates/admin/permissions/permissions.html:113 +#: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy msgid "Allowed IP addresses" msgstr "メールアドレス" -#: rhodecode/templates/admin/permissions/permissions.html:182 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 -#: rhodecode/templates/admin/users/user_edit.html:263 -#: rhodecode/templates/admin/users/user_edit.html:308 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/admin/permissions/permissions.html:127 +#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 +#: rhodecode/templates/admin/users/user_edit.html:212 +#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users_groups/users_groups.html:46 #: rhodecode/templates/data_table/_dt_elements.html:122 #: rhodecode/templates/data_table/_dt_elements.html:130 msgid "delete" msgstr "削除" -#: rhodecode/templates/admin/permissions/permissions.html:183 -#: rhodecode/templates/admin/users/user_edit.html:309 +#: rhodecode/templates/admin/permissions/permissions.html:128 +#: rhodecode/templates/admin/users/user_edit.html:258 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "このメールを削除してよろしいですか: %s" -#: rhodecode/templates/admin/permissions/permissions.html:189 -#: rhodecode/templates/admin/users/user_edit.html:315 +#: rhodecode/templates/admin/permissions/permissions.html:134 +#: rhodecode/templates/admin/users/user_edit.html:264 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:200 -#: rhodecode/templates/admin/users/user_edit.html:326 +#: rhodecode/templates/admin/permissions/permissions.html:145 +#: rhodecode/templates/admin/users/user_edit.html:275 #, fuzzy msgid "New ip address" msgstr "新しいメールアドレス" -#: rhodecode/templates/admin/permissions/permissions.html:208 -#: rhodecode/templates/admin/users/user_edit.html:285 -#: rhodecode/templates/admin/users/user_edit.html:333 +#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:387 +#: rhodecode/templates/admin/users/user_edit.html:234 +#: rhodecode/templates/admin/users/user_edit.html:282 msgid "Add" msgstr "追加" -#: rhodecode/templates/admin/repos/repo_add.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -#: rhodecode/templates/base/base.html:154 +#: rhodecode/templates/admin/repos/repo_add.html:12 +#: rhodecode/templates/admin/repos/repo_add.html:16 +#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 +#: rhodecode/templates/base/base.html:263 msgid "Repositories" msgstr "リポジトリ" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +#: rhodecode/templates/admin/repos/repo_add.html:19 +#, fuzzy +msgid "Add new" msgstr "新規追加" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:104 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Clone from" msgstr "クローン元" #: rhodecode/templates/admin/repos/repo_add_base.html:24 #: rhodecode/templates/admin/repos/repo_edit.html:44 -#: rhodecode/templates/settings/repo_settings.html:43 msgid "Optional http[s] url from which repository should be cloned." msgstr "オプション：クローンするリポジトリのHTTP[S]のURLを指定します" #: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/forks/fork.html:54 +#: rhodecode/templates/forks/fork.html:51 msgid "Optionaly select a group to put this repository into." msgstr "オプション：このリポジトリが属するグループを選択します" @@ -2106,44 +2230,39 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 -#: rhodecode/templates/forks/fork.html:41 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/forks/fork.html:38 msgid "Landing revision" msgstr "ランディングリビジョン" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 -#: rhodecode/templates/forks/fork.html:45 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 -#: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:70 +#: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -msgid "add" -msgstr "追加" - -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 -msgid "add new repository" -msgstr "新しいリポジトリの追加" - -#: rhodecode/templates/admin/repos/repo_edit.html:5 +#: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" msgstr "リポジトリを編集" +#: rhodecode/templates/admin/repos/repo_edit.html:12 +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:11 +#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/summary/summary.html:212 +msgid "Settings" +msgstr "設定" + #: rhodecode/templates/admin/repos/repo_edit.html:40 -#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "クローンURI" #: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 msgid "Optional select a group to put this repository into." msgstr "オプション: このリポジトリを配置するグループを選択します" @@ -2151,166 +2270,213 @@ msgid "Change owner of this repository." msgstr "リポジトリの所有者を変更" -#: rhodecode/templates/admin/repos/repo_edit.html:152 -msgid "Administration" -msgstr "管理" - -#: rhodecode/templates/admin/repos/repo_edit.html:155 +#: rhodecode/templates/admin/repos/repo_edit.html:184 +#, fuzzy +msgid "Advanced settings" +msgstr "設定を保存" + +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Statistics" msgstr "統計" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Reset current statistics" msgstr "現在の統計情報をリセットする" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Confirm to remove current statistics" msgstr "現在の統計情報をリセットしてもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "収集するリビジョン" -#: rhodecode/templates/admin/repos/repo_edit.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:195 msgid "Stats gathered" msgstr "収集した統計情報" -#: rhodecode/templates/admin/repos/repo_edit.html:171 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Remote" msgstr "リモート" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Pull changes from remote location" msgstr "リモートから変更を取り込む" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Confirm to pull changes from remote side" msgstr "リモートから変更を取り込んでもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:186 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "Cache" msgstr "キャッシュ" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Invalidate repository cache" msgstr "リポジトリのキャッシュを無効化" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Confirm to invalidate repository cache" msgstr "リポジトリのキャッシュを無効化してもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:193 +#: rhodecode/templates/admin/repos/repo_edit.html:225 msgid "" "Manually invalidate cache for this repository. On first access repository" " will be cached again" msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。" -#: rhodecode/templates/admin/repos/repo_edit.html:198 +#: rhodecode/templates/admin/repos/repo_edit.html:230 msgid "List of cached values" msgstr "キャッシュしている値の一覧" -#: rhodecode/templates/admin/repos/repo_edit.html:201 +#: rhodecode/templates/admin/repos/repo_edit.html:233 msgid "Prefix" msgstr "プレフィックス" -#: rhodecode/templates/admin/repos/repo_edit.html:202 +#: rhodecode/templates/admin/repos/repo_edit.html:234 msgid "Key" msgstr "キー" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:235 #: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:121 +#: rhodecode/templates/admin/users/user_edit.html:124 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_group_add.html:41 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +#: rhodecode/templates/admin/users_groups/users_groups.html:36 msgid "Active" msgstr "アクティブ" -#: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:306 -#: rhodecode/templates/base/base.html:308 -#: rhodecode/templates/base/base.html:310 +#: rhodecode/templates/admin/repos/repo_edit.html:250 +#: rhodecode/templates/base/base.html:280 +#: rhodecode/templates/base/base.html:281 msgid "Public journal" msgstr "公開ジャーナル" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "Remove from public journal" msgstr "公開ジャーナルから削除する" -#: rhodecode/templates/admin/repos/repo_edit.html:226 +#: rhodecode/templates/admin/repos/repo_edit.html:258 msgid "Add to public journal" msgstr "公開ジャーナルに追加する" -#: rhodecode/templates/admin/repos/repo_edit.html:231 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" -#: rhodecode/templates/admin/repos/repo_edit.html:238 +#: rhodecode/templates/admin/repos/repo_edit.html:270 msgid "Locking" msgstr "ロック" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Unlock locked repo" msgstr "リポジトリのアンロック" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Confirm to unlock repository" msgstr "このリポジトリのロックを外しますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "lock repo" msgstr "リポジトリのロック" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to lock repository" msgstr "このリポジトリをロックしますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:247 +#: rhodecode/templates/admin/repos/repo_edit.html:279 msgid "Repository is not locked" msgstr "リポジトリはロックされていません" -#: rhodecode/templates/admin/repos/repo_edit.html:252 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "リポジトリを強制ロックします。匿名アクセスが無効になっている場合のみ動作します。" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:291 msgid "Set as fork of" msgstr "フォーク元の設定" -#: rhodecode/templates/admin/repos/repo_edit.html:264 +#: rhodecode/templates/admin/repos/repo_edit.html:296 msgid "set" msgstr "保存" -#: rhodecode/templates/admin/repos/repo_edit.html:268 +#: rhodecode/templates/admin/repos/repo_edit.html:300 msgid "Manually set this repository as a fork of another from the list" msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します" -#: rhodecode/templates/admin/repos/repo_edit.html:274 +#: rhodecode/templates/admin/repos/repo_edit.html:306 #: rhodecode/templates/changeset/changeset_file_comment.html:41 msgid "Delete" msgstr "削除" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Remove this repository" msgstr "このリポジトリを削除" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Confirm to delete this repository" msgstr "このリポジトリを削除しますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:282 -#: rhodecode/templates/settings/repo_settings.html:119 +#: rhodecode/templates/admin/repos/repo_edit.html:317 +#, fuzzy, python-format +msgid "this repository has %s fork" +msgid_plural "this repository has %s forks" +msgstr[0] "フォークしてリポジトリを[作成] %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:318 +#, fuzzy +msgid "Detach forks" +msgstr "フォーク元の設定" + +#: rhodecode/templates/admin/repos/repo_edit.html:319 +#, fuzzy +msgid "Delete forks" +msgstr "削除" + +#: rhodecode/templates/admin/repos/repo_edit.html:322 +#, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need fully delete it " -"from file system please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" +" from file system please do it manually" msgstr "" "このリポジトリはRhodeCodeとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n" "完全な削除が必要な場合はファイルシステムから手動で削除してください" +#: rhodecode/templates/admin/repos/repo_edit.html:336 +msgid "Extra fields" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:348 +#, fuzzy, python-format +msgid "Confirm to delete this field: %s" +msgstr "このメールを削除してよろしいですか: %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:362 +#, fuzzy +msgid "New field key" +msgstr "新しいファイルを追加" + +#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgid "New field label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:373 +msgid "Enter short label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:379 +#, fuzzy +msgid "New field description" +msgstr "説明" + +#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgid "Enter description of a field" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -2328,8 +2494,6 @@ #: 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:85 -#: rhodecode/templates/base/base.html:235 msgid "admin" msgstr "管理" @@ -2339,74 +2503,59 @@ msgstr "メンバー" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 -#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "非公開リポジトリ" #: rhodecode/templates/admin/repos/repo_edit_perms.html:19 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 msgid "default" msgstr "default" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 msgid "revoke" msgstr "取消" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 msgid "Add another member" msgstr "別のメンバーを追加" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 msgid "Failed to remove user" msgstr "ユーザーの削除に失敗しました" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 -msgid "Failed to remove users group" +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 +#, fuzzy +msgid "Failed to remove user group" msgstr "ユーザーグループの削除に失敗しました" #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "リポジトリ管理" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 msgid "apply to children" msgstr "子リポジトリにも適用" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" msgstr "" +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#, fuzzy, python-format +msgid "%s Group Dashboard" +msgstr "%s 軽量ダッシュボードを使用" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 -#: rhodecode/templates/base/base.html:128 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 msgid "Home" msgstr "ホーム" @@ -2415,77 +2564,85 @@ msgstr "と" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repos group" -msgstr "リポジトリグループを追加" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 -msgid "Repos groups" +#, fuzzy +msgid "Add repository group" msgstr "リポジトリグループ" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 -msgid "add new repos group" +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 +#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 +#, fuzzy +msgid "Repository groups" +msgstr "リポジトリグループ" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 +#, fuzzy +msgid "Add new repository group" msgstr "新しいリポジトリグループを追加" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 msgid "Group parent" msgstr "親グループ" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/users/user_add.html:94 -#: rhodecode/templates/admin/users_groups/users_group_add.html:49 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:149 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59 msgid "save" msgstr "保存" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repos group" -msgstr "リポジトリグループを編集" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 -msgid "edit repos group" +#, fuzzy +msgid "Edit repository group" msgstr "リポジトリグループを編集" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 +#, fuzzy, python-format +msgid "Edit repository group %s" +msgstr "リポジトリグループを編集 %s" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 #, fuzzy -msgid "Add new child group" +msgid "Add child group" msgstr "新しいユーザーグループを追加" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repositories groups administration" +#, fuzzy +msgid "Repository groups administration" msgstr "リポジトリグループ管理" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -#, fuzzy -msgid "Add new group" -msgstr "新しいユーザーグループを追加" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" msgstr "トップレベルリポジトリの数" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "アクション" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#, fuzzy +msgid "Edit" +msgstr "編集" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/base/perms_summary.html:29 +#: rhodecode/templates/base/perms_summary.html:48 +#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/data_table/_dt_elements.html:116 +#: rhodecode/templates/data_table/_dt_elements.html:117 +msgid "edit" +msgstr "編集" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "このグループを削除してもよろしいですか？: %s %s リポジトリ" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68 -msgid "There are no repositories groups yet" +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 +#, fuzzy +msgid "There are no repository groups yet" msgstr "まだリポジトリグループがありません" #: rhodecode/templates/admin/settings/hooks.html:5 @@ -2493,12 +2650,6 @@ msgid "Settings administration" msgstr "設定管理" -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:13 -msgid "Settings" -msgstr "設定" - #: rhodecode/templates/admin/settings/hooks.html:24 msgid "Built in hooks - read only" msgstr "組み込みフック - 読み込み専用" @@ -2515,118 +2666,128 @@ msgid "Failed to remove hook" msgstr "フックの削除に失敗しました" -#: rhodecode/templates/admin/settings/settings.html:24 +#: rhodecode/templates/admin/settings/settings.html:26 msgid "Remap and rescan repositories" msgstr "リポジトリの再マッピングと再スキャン" -#: rhodecode/templates/admin/settings/settings.html:32 -msgid "rescan option" +#: rhodecode/templates/admin/settings/settings.html:34 +#, fuzzy +msgid "Rescan option" msgstr "再スキャンオプション" -#: rhodecode/templates/admin/settings/settings.html:38 +#: rhodecode/templates/admin/settings/settings.html:40 msgid "" "In case a repository was deleted from filesystem and there are leftovers " "in the database check this option to scan obsolete data in database and " "remove it." msgstr "" -#: rhodecode/templates/admin/settings/settings.html:39 -msgid "destroy old data" +#: rhodecode/templates/admin/settings/settings.html:41 +#, fuzzy +msgid "Destroy old data" msgstr "古いデータを削除する" -#: rhodecode/templates/admin/settings/settings.html:41 +#: rhodecode/templates/admin/settings/settings.html:43 msgid "" "Rescan repositories location for new repositories. Also deletes obsolete " "if `destroy` flag is checked " msgstr "" -#: rhodecode/templates/admin/settings/settings.html:46 +#: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" msgstr "リポジトリを再チェック" -#: rhodecode/templates/admin/settings/settings.html:52 +#: rhodecode/templates/admin/settings/settings.html:54 msgid "Whoosh indexing" msgstr "Whooshインデックス" -#: rhodecode/templates/admin/settings/settings.html:60 -msgid "index build option" +#: rhodecode/templates/admin/settings/settings.html:62 +#, fuzzy +msgid "Index build option" msgstr "インデックス作成時の設定" -#: rhodecode/templates/admin/settings/settings.html:65 -msgid "build from scratch" +#: rhodecode/templates/admin/settings/settings.html:67 +#, fuzzy +msgid "Build from scratch" msgstr "一度削除してから再度インデックスを作成" -#: rhodecode/templates/admin/settings/settings.html:71 +#: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" msgstr "再インデックス" -#: rhodecode/templates/admin/settings/settings.html:77 +#: rhodecode/templates/admin/settings/settings.html:79 msgid "Global application settings" msgstr "アプリケーション全体の設定" -#: rhodecode/templates/admin/settings/settings.html:86 -msgid "Application name" -msgstr "アプリケーション名" - -#: rhodecode/templates/admin/settings/settings.html:95 -msgid "Realm text" -msgstr "Realmテキスト" - -#: rhodecode/templates/admin/settings/settings.html:104 -msgid "GA code" -msgstr "GAコード" - -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/settings/settings.html:268 +#: rhodecode/templates/admin/settings/settings.html:88 +msgid "Site branding" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:97 +msgid "HTTP authentication realm" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:106 +msgid "Google Analytics code" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:114 +#: rhodecode/templates/admin/settings/settings.html:186 +#: rhodecode/templates/admin/settings/settings.html:277 msgid "Save settings" msgstr "設定を保存" -#: rhodecode/templates/admin/settings/settings.html:119 +#: rhodecode/templates/admin/settings/settings.html:121 msgid "Visualisation settings" msgstr "表示の設定" -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:129 msgid "General" msgstr "一般" -#: rhodecode/templates/admin/settings/settings.html:132 +#: rhodecode/templates/admin/settings/settings.html:134 msgid "Use lightweight dashboard" msgstr "軽量ダッシュボードを使用" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:140 +#, fuzzy +msgid "Use repository extra fields" +msgstr "リポジトリ" + +#: rhodecode/templates/admin/settings/settings.html:147 msgid "Icons" msgstr "アイコン" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Show public repo icon on repositories" msgstr "公開リポジトリのアイコンを表示" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:156 msgid "Show private repo icon on repositories" msgstr "非公開リポジトリのアイコンを表示" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:163 msgid "Meta-Tagging" msgstr "メタタグ" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:168 msgid "Stylify recognised metatags:" msgstr "次のメタタグを変換する" -#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:195 msgid "VCS settings" msgstr "VCSの設定" -#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:201 -msgid "require ssl for vcs operations" +#: rhodecode/templates/admin/settings/settings.html:209 +#, fuzzy +msgid "Require SSL for vcs operations" msgstr "VCSの操作にSSLを必須とする" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" @@ -2634,88 +2795,94 @@ "RhodeCodeはPushとPullにSSLを要求します。もしSSLでない場合、HTTP Error 406: Not " "Acceptalbeを返します" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:217 msgid "Hooks" msgstr "フック" -#: rhodecode/templates/admin/settings/settings.html:214 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Update repository after push (hg update)" msgstr "プッシュ後にリポジトリをを更新する (hg update)" -#: rhodecode/templates/admin/settings/settings.html:218 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Show repository size after push" msgstr "プッシュ後にリポジトリのサイズを表示する" -#: rhodecode/templates/admin/settings/settings.html:222 -msgid "Log user push commands" -msgstr "ユーザーのプッシュコマンドを記録する" - -#: rhodecode/templates/admin/settings/settings.html:226 -msgid "Log user pull commands" -msgstr "ユーザーのプルコマンドを記録する" - #: rhodecode/templates/admin/settings/settings.html:230 -msgid "advanced setup" +msgid "Log user push commands" +msgstr "ユーザーのプッシュコマンドを記録する" + +#: rhodecode/templates/admin/settings/settings.html:234 +msgid "Log user pull commands" +msgstr "ユーザーのプルコマンドを記録する" + +#: rhodecode/templates/admin/settings/settings.html:238 +#, fuzzy +msgid "Advanced setup" msgstr "高度な設定" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Mercurial Extensions" msgstr "Mercurialエクステンション" -#: rhodecode/templates/admin/settings/settings.html:240 -msgid "largefiles extensions" +#: rhodecode/templates/admin/settings/settings.html:248 +#, fuzzy +msgid "Enable largefiles extension" msgstr "largefilesエクステンション" -#: rhodecode/templates/admin/settings/settings.html:244 -msgid "hgsubversion extensions" +#: rhodecode/templates/admin/settings/settings.html:252 +#, fuzzy +msgid "Enable hgsubversion extension" msgstr "hgsubversionエクステンション" -#: rhodecode/templates/admin/settings/settings.html:246 +#: rhodecode/templates/admin/settings/settings.html:254 +#, fuzzy msgid "" -"Requires hgsubversion library installed. Allows clonning from svn remote " +"Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "hgsubversion のインストールが必要です。リモートロケーションのsvnからクローン出来るようになります" -#: rhodecode/templates/admin/settings/settings.html:256 +#: rhodecode/templates/admin/settings/settings.html:264 msgid "Repositories location" msgstr "リポジトリロケーション" -#: rhodecode/templates/admin/settings/settings.html:261 +#: rhodecode/templates/admin/settings/settings.html:269 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "これはアプリケーションの重要な設定です。本当に変更が必要でしょうか。もし、変更した場合、変更を反映さ競るためにアプリケーションを再起動する必要があります。アンロックにするにはこのラベルをクリックして下さい" -#: rhodecode/templates/admin/settings/settings.html:262 -#: rhodecode/templates/base/base.html:227 -msgid "unlock" +#: rhodecode/templates/admin/settings/settings.html:270 +#: rhodecode/templates/base/base.html:131 +#, fuzzy +msgid "Unlock" msgstr "アンロック" -#: rhodecode/templates/admin/settings/settings.html:263 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:283 +#: rhodecode/templates/admin/settings/settings.html:292 msgid "Test Email" msgstr "テストメール" -#: rhodecode/templates/admin/settings/settings.html:291 +#: rhodecode/templates/admin/settings/settings.html:300 msgid "Email to" msgstr "送信先" -#: rhodecode/templates/admin/settings/settings.html:299 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "Send" msgstr "送る" -#: rhodecode/templates/admin/settings/settings.html:305 +#: rhodecode/templates/admin/settings/settings.html:314 msgid "System Info and Packages" msgstr "システム情報とパッケージ" -#: rhodecode/templates/admin/settings/settings.html:308 -msgid "show" +#: rhodecode/templates/admin/settings/settings.html:317 +#: rhodecode/templates/changelog/changelog.html:42 +msgid "Show" msgstr "表示" #: rhodecode/templates/admin/users/user_add.html:5 @@ -2724,11 +2891,14 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 +#: rhodecode/templates/base/base.html:71 msgid "Users" msgstr "ユーザー" #: rhodecode/templates/admin/users/user_add.html:12 -msgid "add new user" +#: rhodecode/templates/admin/users/users.html:23 +#, fuzzy +msgid "Add new user" msgstr "新しいユーザーを追加" #: rhodecode/templates/admin/users/user_add.html:50 @@ -2739,6 +2909,12 @@ msgid "Edit user" msgstr "ユーザー編集" +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#, fuzzy, python-format +msgid "Edit %s" +msgstr "編集 %s" + #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 msgid "Change your avatar at" @@ -2754,30 +2930,31 @@ msgid "API key" msgstr "APIキー" -#: rhodecode/templates/admin/users/user_edit.html:48 -msgid "Your IP" +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 +msgid "Current IP" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:67 +#: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" msgstr "LDAP DN" -#: rhodecode/templates/admin/users/user_edit.html:76 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39 +#: rhodecode/templates/admin/users/user_edit.html:79 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password" msgstr "新しいパスワード" -#: rhodecode/templates/admin/users/user_edit.html:85 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48 +#: rhodecode/templates/admin/users/user_edit.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "New password confirmation" msgstr "新しいパスワード 再入力" -#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:158 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "デフォルトの権限を継承する" -#: rhodecode/templates/admin/users/user_edit.html:160 +#: rhodecode/templates/admin/users/user_edit.html:163 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2785,31 +2962,31 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:169 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "リポジトリを作成する" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:177 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "リポジトリをフォークする" -#: rhodecode/templates/admin/users/user_edit.html:251 +#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "メールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/users/user_edit.html:213 #, python-format msgid "Confirm to delete this email: %s" msgstr "このメールを削除してよろしいですか: %s" -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "New email address" msgstr "新しいメールアドレス" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:130 +#: rhodecode/templates/base/base.html:242 msgid "My account" msgstr "アカウント" @@ -2822,7 +2999,7 @@ msgstr "権限" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:57 +#: rhodecode/templates/journal/journal.html:54 msgid "My repos" msgstr "リポジトリ" @@ -2830,30 +3007,44 @@ msgid "My pull requests" msgstr "プルリクエスト" -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/journal/journal.html:61 -msgid "Add repo" -msgstr "リポジトリの追加" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 +#, fuzzy +msgid "Show closed pull requests" +msgstr "プルリクエストを[クローズ]" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" msgstr "自分が作成" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 #, python-format msgid "Pull request #%s opened on %s" msgstr "プルリクエスト #%s %s に作成" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 +#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_show.html:27 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +msgid "Closed" +msgstr "クローズ" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 msgid "Confirm to delete this pull request" msgstr "このプルリクエストを削除しますか？" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 +msgid "Nothing here yet" +msgstr "まだありません" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" msgstr "レビュアーとして参加" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "プルリクエスト #%s %s によって %s に作成" @@ -2863,68 +3054,60 @@ msgstr "ユーザー管理" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:241 msgid "users" msgstr "ユーザー" -#: rhodecode/templates/admin/users/users.html:23 +#: rhodecode/templates/admin/users/users.html:80 #, fuzzy -msgid "Add new user" -msgstr "新しいユーザーを追加" - -#: rhodecode/templates/admin/users/users.html:77 -msgid "username" -msgstr "ユーザー名" - -#: rhodecode/templates/admin/users/users.html:80 -msgid "firstname" +msgid "Firstname" msgstr "名前" #: rhodecode/templates/admin/users/users.html:81 -msgid "lastname" +#, fuzzy +msgid "Lastname" msgstr "名字" #: rhodecode/templates/admin/users/users.html:82 -msgid "last login" +#, fuzzy +msgid "Last login" msgstr "最終ログイン日" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" -msgstr "アクティブ" - -#: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:244 -msgid "ldap" -msgstr "LDAP" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -msgid "Add users group" +#, fuzzy +msgid "Add user group" msgstr "ユーザーグループを追加" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -msgid "Users groups" +#: rhodecode/templates/admin/users_groups/users_groups.html:11 +#: rhodecode/templates/base/base.html:72 +#, fuzzy +msgid "User groups" msgstr "ユーザーグループ" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -msgid "add new users group" +#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#, fuzzy +msgid "Add new user group" msgstr "新しいユーザーグループを追加" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit users group" +#, fuzzy +msgid "Edit user group" msgstr "ユーザーグループを編集" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -msgid "UsersGroups" +#, fuzzy +msgid "UserGroups" msgstr "ユーザーグループ" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "Members" msgstr "メンバー" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -msgid "Choosen group members" +#, fuzzy +msgid "Chosen group members" msgstr "グループメンバーを選ぶ" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 @@ -2939,264 +3122,264 @@ msgid "Add all elements" msgstr "全ての要素を追加" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 msgid "Group members" msgstr "グループメンバー" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 msgid "No members yet" msgstr "まだメンバーがいません" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 -msgid "Permissions defined for this group" -msgstr "このリポジトリの権限設定" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 -msgid "No permissions set yet" -msgstr "まだ権限設定がありません" - #: rhodecode/templates/admin/users_groups/users_groups.html:5 -msgid "Users groups administration" +#, fuzzy +msgid "User groups administration" msgstr "ユーザーグループ管理" -#: rhodecode/templates/admin/users_groups/users_groups.html:23 -#, fuzzy -msgid "Add new user group" -msgstr "新しいユーザーグループを追加" - -#: rhodecode/templates/admin/users_groups/users_groups.html:32 -msgid "group name" -msgstr "グループ名" - -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -#: rhodecode/templates/base/root.html:46 -msgid "members" -msgstr "メンバー" - -#: rhodecode/templates/admin/users_groups/users_groups.html:45 -#, python-format -msgid "Confirm to delete this users group: %s" +#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#, fuzzy, python-format +msgid "Confirm to delete this user group: %s" msgstr "ユーザグループを削除しますか？: %s" -#: rhodecode/templates/base/base.html:41 +#: rhodecode/templates/base/base.html:42 msgid "Submit a bug" msgstr "バグレポート" -#: rhodecode/templates/base/base.html:76 -#, fuzzy -msgid "Not logged in" -msgstr "最終ログイン日" - -#: rhodecode/templates/base/base.html:83 -msgid "Login to your account" -msgstr "ログイン" - -#: rhodecode/templates/base/base.html:106 -msgid "Forgot password ?" -msgstr "パスワードを忘れた場合はこちら" - -#: rhodecode/templates/base/base.html:113 -msgid "Log In" -msgstr "ログイン" - -#: rhodecode/templates/base/base.html:124 -msgid "Inbox" -msgstr "受信箱" - -#: rhodecode/templates/base/base.html:129 -#: rhodecode/templates/base/base.html:297 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:301 -#: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/public_journal.html:4 -msgid "Journal" -msgstr "ジャーナル" - -#: rhodecode/templates/base/base.html:131 -msgid "Log Out" -msgstr "ログアウト" - -#: rhodecode/templates/base/base.html:150 -msgid "Switch repository" -msgstr "リポジトリの切り替え" - -#: rhodecode/templates/base/base.html:152 -msgid "Products" -msgstr "" - -#: rhodecode/templates/base/base.html:158 -#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47 -msgid "loading..." -msgstr "読み込み中..." - -#: rhodecode/templates/base/base.html:166 -#: rhodecode/templates/base/base.html:168 -#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/base/base.html:108 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 +#: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "要約" -#: rhodecode/templates/base/base.html:174 -#: rhodecode/templates/base/base.html:176 -#: rhodecode/templates/base/base.html:178 -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/base/base.html:109 +#: rhodecode/templates/changelog/changelog.html:11 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "履歴" -#: rhodecode/templates/base/base.html:182 -#: rhodecode/templates/base/base.html:184 -#: rhodecode/templates/base/base.html:186 -msgid "Switch to" -msgstr "ブランチの切り替え" - -#: rhodecode/templates/base/base.html:193 -#: rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:110 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:12 msgid "Files" msgstr "ファイル" -#: rhodecode/templates/base/base.html:201 -#: rhodecode/templates/base/base.html:205 +#: rhodecode/templates/base/base.html:112 +#, fuzzy +msgid "Switch To" +msgstr "ブランチの切り替え" + +#: rhodecode/templates/base/base.html:114 +#: rhodecode/templates/base/base.html:267 +msgid "loading..." +msgstr "読み込み中..." + +#: rhodecode/templates/base/base.html:118 msgid "Options" msgstr "オプション" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/base/base.html:212 -msgid "repository settings" -msgstr "リポジトリ設定" - -#: rhodecode/templates/base/base.html:216 -#: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/forks/fork.html:13 -msgid "fork" -msgstr "フォーク" - -#: rhodecode/templates/base/base.html:218 -#: rhodecode/templates/changelog/changelog.html:43 +#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "フォークを比較" + +#: rhodecode/templates/base/base.html:126 #, fuzzy -msgid "open new pull request" -msgstr "新しいプルリクエストを作成" - -#: rhodecode/templates/base/base.html:221 +msgid "Lightweight changelog" +msgstr "軽量ダッシュボードを使用" + +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:54 +msgid "Search" +msgstr "検索" + +#: rhodecode/templates/base/base.html:133 +#, fuzzy +msgid "Lock" +msgstr "ロック" + +#: rhodecode/templates/base/base.html:141 +#, fuzzy +msgid "Follow" +msgstr "フォロワー" + +#: rhodecode/templates/base/base.html:142 #, fuzzy -msgid "compare fork" -msgstr "フォークを比較" - -#: rhodecode/templates/base/base.html:223 -msgid "search" -msgstr "検索" - -#: rhodecode/templates/base/base.html:229 -msgid "lock" -msgstr "ロック" - -#: rhodecode/templates/base/base.html:240 -msgid "repositories groups" -msgstr "リポジトリグループ" - -#: rhodecode/templates/base/base.html:242 -msgid "users groups" -msgstr "ユーザーグループ" +msgid "Unfollow" +msgstr "フォロワー" + +#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/forks/fork.html:9 +msgid "Fork" +msgstr "フォーク" + +#: rhodecode/templates/base/base.html:147 +#, fuzzy +msgid "Create Pull Request" +msgstr "新しいプルリクエストを作成" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Show Pull Requests" +msgstr "新しいプルリクエスト" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Pull Requests" +msgstr "プルリクエスト" + +#: rhodecode/templates/base/base.html:190 +#, fuzzy +msgid "Not logged in" +msgstr "最終ログイン日" + +#: rhodecode/templates/base/base.html:197 +msgid "Login to your account" +msgstr "ログイン" + +#: rhodecode/templates/base/base.html:220 +msgid "Forgot password ?" +msgstr "パスワードを忘れた場合はこちら" #: rhodecode/templates/base/base.html:243 -msgid "permissions" +msgid "Log Out" +msgstr "ログアウト" + +#: rhodecode/templates/base/base.html:262 +msgid "Switch repository" +msgstr "リポジトリの切り替え" + +#: rhodecode/templates/base/base.html:274 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "ジャーナル" + +#: rhodecode/templates/base/base.html:286 +#, fuzzy +msgid "Search in repositories" +msgstr "全てのリポジトリから検索" + +#: rhodecode/templates/base/perms_summary.html:8 +#, fuzzy +msgid "No permissions defined yet" +msgstr "まだ権限設定がありません" + +#: rhodecode/templates/base/perms_summary.html:15 +msgid "Permission" msgstr "権限" -#: rhodecode/templates/base/base.html:245 -msgid "defaults" -msgstr "デフォルト設定" - -#: rhodecode/templates/base/base.html:246 -msgid "settings" -msgstr "設定" - -#: rhodecode/templates/base/base.html:256 -#: rhodecode/templates/base/base.html:258 -msgid "Followers" -msgstr "フォロワー" - -#: rhodecode/templates/base/base.html:264 -#: rhodecode/templates/base/base.html:266 -msgid "Forks" -msgstr "フォーク" - -#: rhodecode/templates/base/base.html:315 -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 -#: rhodecode/templates/search/search.html:52 -msgid "Search" -msgstr "検索" - -#: rhodecode/templates/base/root.html:42 -msgid "add another comment" -msgstr "別のコメントを追加" +#: rhodecode/templates/base/perms_summary.html:16 +msgid "Edit Permission" +msgstr "権限の編集" #: rhodecode/templates/base/root.html:43 +#, fuzzy +msgid "Add another comment" +msgstr "別のコメントを追加" + +#: rhodecode/templates/base/root.html:44 #: rhodecode/templates/data_table/_dt_elements.html:140 -#: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" -#: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:61 +#: rhodecode/templates/base/root.html:45 msgid "Start following this repository" msgstr "このリポジトリのフォローする" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Group" msgstr "グループ" +#: rhodecode/templates/base/root.html:47 +msgid "members" +msgstr "メンバー" + #: rhodecode/templates/base/root.html:48 -msgid "search truncated" -msgstr "検索結果は省略されています" +#: rhodecode/templates/pullrequests/pullrequest.html:181 +#, fuzzy +msgid "Loading ..." +msgstr "読み込み中..." #: rhodecode/templates/base/root.html:49 -msgid "no matching files" -msgstr "マッチするファイルはありません" +#, fuzzy +msgid "Search truncated" +msgstr "検索結果は省略されています" #: rhodecode/templates/base/root.html:50 -msgid "Open new pull request" -msgstr "新しいプルリクエストを作成" +#, fuzzy +msgid "No matching files" +msgstr "マッチするファイルはありません" #: rhodecode/templates/base/root.html:51 -msgid "Open new pull request for selected changesets" -msgstr "選択したチェンジセットから新しいプルリクエストを作成" +#: rhodecode/templates/changelog/changelog.html:36 +msgid "Open new pull request" +msgstr "新しいプルリクエストを作成" #: rhodecode/templates/base/root.html:52 -msgid "Show selected changes __S -> __E" -msgstr "選択した変更 __S -> __E を表示" +msgid "Open new pull request for selected changesets" +msgstr "選択したチェンジセットから新しいプルリクエストを作成" #: rhodecode/templates/base/root.html:53 +#, fuzzy +msgid "Show selected changesets __S -> __E" +msgstr "選択した変更 __S -> __E を表示" + +#: rhodecode/templates/base/root.html:54 +#, fuzzy +msgid "Show selected changeset __S" +msgstr "選択した変更 __S -> __E を表示" + +#: rhodecode/templates/base/root.html:55 msgid "Selection link" msgstr "" +#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/changeset/diff_block.html:8 +#, fuzzy +msgid "Collapse diff" +msgstr "ファイル差分" + +#: rhodecode/templates/base/root.html:57 +#, fuzzy +msgid "Expand diff" +msgstr "パッチとして差分を表示" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "%s ブックマーク" -#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "作成者" -#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks.html:38 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/tags/tags.html:55 +#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "リビジョン" @@ -3206,15 +3389,13 @@ msgid "%s Branches" msgstr "%s ブランチ" -#: rhodecode/templates/branches/branches.html:29 +#: rhodecode/templates/branches/branches.html:26 msgid "Compare branches" msgstr "ブランチの比較" -#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches.html:53 #: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/compare/compare_diff.html:5 -#: rhodecode/templates/compare/compare_diff.html:13 -#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "比較" @@ -3224,115 +3405,82 @@ msgid "%s Changelog" msgstr "%s チェンジログ" -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/changelog/changelog.html:11 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" -#: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/changelog/changelog.html:30 msgid "Clear selection" msgstr "選択を解除" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 #: rhodecode/templates/forks/forks_data.html:19 -#, python-format -msgid "compare fork with %s" +#, fuzzy, python-format +msgid "Compare fork with %s" msgstr "%s とフォークを比較" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 msgid "Compare fork with parent" msgstr "フォークを比較" -#: rhodecode/templates/changelog/changelog.html:49 -msgid "Show" -msgstr "表示" - -#: rhodecode/templates/changelog/changelog.html:74 -#: rhodecode/templates/summary/summary.html:375 -msgid "show more" +#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/summary/summary.html:404 +#, fuzzy +msgid "Show more" msgstr "もっと表示" -#: rhodecode/templates/changelog/changelog.html:78 -msgid "Affected number of files, click to show more details" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:65 -#: rhodecode/templates/changeset/changeset_file_comment.html:20 -#: rhodecode/templates/changeset/changeset_range.html:46 -msgid "Changeset status" -msgstr "リビジョンステータス" - -#: rhodecode/templates/changelog/changelog.html:94 -#: rhodecode/templates/shortlog/shortlog_data.html:20 +#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changeset/changeset_range.html:86 #, fuzzy, python-format -msgid "Click to open associated pull request #%s" -msgstr "関連するプルリクエストを開く" - -#: rhodecode/templates/changelog/changelog.html:104 -msgid "Parent" -msgstr "親リビジョン" - -#: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:42 -msgid "No parents" -msgstr "親リビジョンはありません" - -#: rhodecode/templates/changelog/changelog.html:115 +msgid "Bookmark %s" +msgstr "ブックマーク %s" + +#: rhodecode/templates/changelog/changelog.html:95 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset_range.html:92 +#, fuzzy, python-format +msgid "Tag %s" +msgstr "タグ %s" + +#: rhodecode/templates/changelog/changelog.html:100 #: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:79 -msgid "merge" -msgstr "マージ" - -#: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:109 -#: rhodecode/templates/changeset/changeset_range.html:82 -#: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_add.html:33 -#: rhodecode/templates/files/files_edit.html:33 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -msgid "branch" -msgstr "ブランチ" - -#: rhodecode/templates/changelog/changelog.html:124 -#: rhodecode/templates/changeset/changeset_range.html:88 -msgid "bookmark" -msgstr "ブックマーク" - -#: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:114 -#: rhodecode/templates/changeset/changeset_range.html:94 -msgid "tag" -msgstr "タグ" - -#: rhodecode/templates/changelog/changelog.html:302 +#: rhodecode/templates/changeset/changeset_range.html:80 +#, fuzzy, python-format +msgid "Branch %s" +msgstr "ブランチ %s" + +#: rhodecode/templates/changelog/changelog.html:258 msgid "There are no changes yet" msgstr "まだ変更がありません" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:94 -msgid "removed" +#: rhodecode/templates/changeset/changeset.html:91 +#, fuzzy +msgid "Removed" msgstr "削除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:95 -msgid "changed" +#: rhodecode/templates/changeset/changeset.html:92 +#, fuzzy +msgid "Changed" msgstr "変更" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:96 -msgid "added" +#: rhodecode/templates/changeset/changeset.html:93 +#, fuzzy +msgid "Added" msgstr "追加" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:98 -#: rhodecode/templates/changeset/changeset.html:99 -#: rhodecode/templates/changeset/changeset.html:100 -#, python-format -msgid "affected %s files" +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changeset/changeset.html:97 +#, fuzzy, python-format +msgid "Affected %s files" msgstr "%s ファイルに影響" #: rhodecode/templates/changeset/changeset.html:6 @@ -3340,67 +3488,98 @@ msgid "%s Changeset" msgstr "%s チェンジセット" -#: rhodecode/templates/changeset/changeset.html:14 -msgid "Changeset" -msgstr "チェンジセット" - -#: rhodecode/templates/changeset/changeset.html:52 +#: rhodecode/templates/changeset/changeset.html:39 +msgid "No parents" +msgstr "親リビジョンはありません" + +#: rhodecode/templates/changeset/changeset.html:49 msgid "No children" msgstr "子リビジョンはありません" -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/diff_block.html:20 -msgid "raw diff" +#: rhodecode/templates/changeset/changeset.html:62 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:44 +msgid "Changeset status" +msgstr "リビジョンステータス" + +#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/diff_block.html:23 +#, fuzzy +msgid "Raw diff" msgstr "差分を表示" -#: rhodecode/templates/changeset/changeset.html:71 -msgid "patch diff" +#: rhodecode/templates/changeset/changeset.html:68 +#, fuzzy +msgid "Patch diff" msgstr "パッチとして差分を表示" -#: rhodecode/templates/changeset/changeset.html:72 -#: rhodecode/templates/changeset/diff_block.html:21 -msgid "download diff" +#: rhodecode/templates/changeset/changeset.html:69 +#: rhodecode/templates/changeset/diff_block.html:24 +#, fuzzy +msgid "Download diff" msgstr "差分をダウンロード" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d コメント" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "(%d インライン)" -#: rhodecode/templates/changeset/changeset.html:122 -#: rhodecode/templates/compare/compare_diff.html:44 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:77 +msgid "merge" +msgstr "マージ" + +#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/compare/compare_diff.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s ファイルに影響" -#: rhodecode/templates/changeset/changeset.html:124 -#: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/pullrequests/pullrequest_show.html:96 +#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/compare/compare_diff.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s ファイルに影響。 %s 個の追加と %s 個の削除" +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Showing a huge diff might take some time and resources" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +#, fuzzy +msgid "Show full diff" +msgstr "すべての履歴を表示" + #: rhodecode/templates/changeset/changeset_file_comment.html:30 #, fuzzy, python-format -msgid "Status from pull request %s" -msgstr "すべてのプルリクエスト" +msgid "Status change on pull request #%s" +msgstr "すべてのプルリクエスト #%s" #: rhodecode/templates/changeset/changeset_file_comment.html:32 #, fuzzy, python-format -msgid "Comment from pull request %s" -msgstr "プルリクエストに[コメント]" +msgid "Comment on pull request #%s" +msgstr "プルリクエストに[コメント] #%s" #: rhodecode/templates/changeset/changeset_file_comment.html:57 msgid "Submitting..." @@ -3411,25 +3590,25 @@ msgstr "{1} 行目にコメント" #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:139 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "コメントには %s 構文 ( %s サポートつき ) が利用出来ます" #: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:142 +#: rhodecode/templates/changeset/changeset_file_comment.html:141 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "テキスト内で @username を使うと、この RhodeCode のユーザーに通知を送信します" #: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:162 +#: rhodecode/templates/changeset/changeset_file_comment.html:161 msgid "Comment" msgstr "コメント" #: rhodecode/templates/changeset/changeset_file_comment.html:75 -#: rhodecode/templates/changeset/changeset_file_comment.html:86 -msgid "Hide" -msgstr "隠す" +#, fuzzy +msgid "Cancel" +msgstr "変更" #: rhodecode/templates/changeset/changeset_file_comment.html:82 msgid "You need to be logged in to comment." @@ -3439,19 +3618,16 @@ msgid "Login now" msgstr "今すぐログインする" -#: rhodecode/templates/changeset/changeset_file_comment.html:137 -msgid "Leave a comment" -msgstr "コメントを残す" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "Check this to change current status of code-review for this changeset" -msgstr "チェックするとチェンジセットの現在のコードレビューステータスを変更出来ます" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "change status" +#: rhodecode/templates/changeset/changeset_file_comment.html:86 +msgid "Hide" +msgstr "隠す" + +#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#, fuzzy +msgid "Change status" msgstr "ステータスを変更する" -#: rhodecode/templates/changeset/changeset_file_comment.html:164 +#: rhodecode/templates/changeset/changeset_file_comment.html:163 msgid "Comment and close" msgstr "コメントしてクローズ" @@ -3460,69 +3636,78 @@ msgid "%s Changesets" msgstr "%s チェンジセット" -#: rhodecode/templates/changeset/changeset_range.html:29 -#: rhodecode/templates/compare/compare_diff.html:29 -msgid "Compare View" -msgstr "比較ビュー" - -#: rhodecode/templates/changeset/changeset_range.html:29 -msgid "Show combined compare" -msgstr "結合した比較ビューを表示" - -#: rhodecode/templates/changeset/changeset_range.html:54 +#: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" msgstr "影響のあるファイル" -#: rhodecode/templates/changeset/diff_block.html:19 -msgid "show full diff for this file" +#: rhodecode/templates/changeset/diff_block.html:22 +#, fuzzy +msgid "Show full diff for this file" msgstr "このファイルの全差分を表示" -#: rhodecode/templates/changeset/diff_block.html:27 -msgid "show inline comments" +#: rhodecode/templates/changeset/diff_block.html:30 +#, fuzzy +msgid "Show inline comments" msgstr "インラインコメントを表示" -#: rhodecode/templates/compare/compare_cs.html:5 +#: rhodecode/templates/changeset/diff_block.html:55 +msgid "Show file at latest version in this repo" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:56 +msgid "Show file at initial version in this repo" +msgstr "" + +#: rhodecode/templates/compare/compare_cs.html:4 msgid "No changesets" msgstr "チェンジセットはありません" -#: rhodecode/templates/compare/compare_diff.html:37 -#: rhodecode/templates/pullrequests/pullrequest_show.html:87 +#: rhodecode/templates/compare/compare_cs.html:32 +#, fuzzy +msgid "Ancestor" +msgstr "ブランチ" + +#: rhodecode/templates/compare/compare_diff.html:5 +#, fuzzy, python-format +msgid "%s Compare" +msgstr "%s 比較" + +#: rhodecode/templates/compare/compare_diff.html:9 +#, fuzzy +msgid "Compare revisions" +msgstr "前のリビジョン" + +#: rhodecode/templates/compare/compare_diff.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:106 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "%s コミットを表示" -#: rhodecode/templates/compare/compare_diff.html:52 -#: rhodecode/templates/pullrequests/pullrequest_show.html:102 +#: rhodecode/templates/compare/compare_diff.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:121 msgid "No files" msgstr "ファイルはありません" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 -msgid "Fork" -msgstr "フォーク" +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +msgid "confirm to show potentially huge diff" +msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:54 -#: rhodecode/templates/summary/summary.html:77 +#: rhodecode/templates/summary/summary.html:69 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:56 -#: rhodecode/templates/summary/summary.html:80 +#: rhodecode/templates/summary/summary.html:72 msgid "Git repository" msgstr "Gitリポジトリ" -#: rhodecode/templates/data_table/_dt_elements.html:63 -#: rhodecode/templates/summary/summary.html:87 -msgid "public repository" -msgstr "公開リポジトリ" - #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/summary/summary.html:96 -#: rhodecode/templates/summary/summary.html:97 -msgid "Fork of" -msgstr "フォーク元: " +#, fuzzy, python-format +msgid "Fork of %s" +msgstr "フォーク名 %s" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3550,28 +3735,45 @@ msgid "Confirm to delete this user: %s" msgstr "このユーザーを本当に削除してよろしいですか？: %s" -#: rhodecode/templates/email_templates/changeset_comment.html:10 -msgid "New status$" -msgstr "新しいステータス$" +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:15 +msgid "New status" +msgstr "新しいステータス" + +#: rhodecode/templates/email_templates/changeset_comment.html:11 +#: rhodecode/templates/email_templates/pull_request_comment.html:9 +msgid "View this comment here" +msgstr "このコメントを閲覧する" + +#: rhodecode/templates/email_templates/changeset_comment.html:14 +#, fuzzy +msgid "Repo" +msgstr "リポジトリ" + +#: rhodecode/templates/email_templates/changeset_comment.html:16 +msgid "desc" +msgstr "" #: rhodecode/templates/email_templates/main.html:8 msgid "This is a notification from RhodeCode." msgstr "RhodeCodeからの通知です" #: rhodecode/templates/email_templates/password_reset.html:4 -msgid "Hello" -msgstr "こんにちは" - -#: rhodecode/templates/email_templates/password_reset.html:6 +#, fuzzy, python-format +msgid "Hello %s" +msgstr "こんにちは %s" + +#: rhodecode/templates/email_templates/password_reset.html:5 msgid "We received a request to create a new password for your account." msgstr "あなたのアカウントの新しいパスワードの生成リクエストを受け取りました。" -#: rhodecode/templates/email_templates/password_reset.html:8 +#: rhodecode/templates/email_templates/password_reset.html:6 msgid "You can generate it by clicking following URL" msgstr "下のURLをクリックすることで再生成が行えます。" -#: rhodecode/templates/email_templates/password_reset.html:12 -msgid "If you didn't request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:11 +#, fuzzy +msgid "If you did not request new password please ignore this email." msgstr "新しいパスワードのリクエストをしていない場合は、このメールを無視して下さい。" #: rhodecode/templates/email_templates/pull_request.html:4 @@ -3582,34 +3784,30 @@ msgstr "ユーザ %s がリポジトリ %s で新しいプルリクエストを作成しました。変更をレビューしてください。" #: rhodecode/templates/email_templates/pull_request.html:5 -msgid "title" -msgstr "タイトル" +msgid "View this pull request here" +msgstr "このプルリクエストを閲覧する" #: rhodecode/templates/email_templates/pull_request.html:6 -#: rhodecode/templates/pullrequests/pullrequest.html:115 +msgid "title" +msgstr "タイトル" + +#: rhodecode/templates/email_templates/pull_request.html:7 msgid "description" msgstr "説明" -#: rhodecode/templates/email_templates/pull_request.html:7 -msgid "View this pull request here" -msgstr "このプルリクエストを閲覧する" - #: rhodecode/templates/email_templates/pull_request.html:12 msgid "revisions for reviewing" msgstr "レビュー対象のリビジョン" -#: rhodecode/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "User %s commented on pull request #%s for repository %s" -msgstr "ユーザ %s がプルリクエスト #%s (リポジトリ %s) にコメントしました。" - -#: rhodecode/templates/email_templates/pull_request_comment.html:10 -msgid "New status" -msgstr "新しいステータス" - -#: rhodecode/templates/email_templates/pull_request_comment.html:14 -msgid "View this comment here" -msgstr "このコメントを閲覧する" +#: rhodecode/templates/email_templates/pull_request_comment.html:3 +#, fuzzy, python-format +msgid "Pull request #%s for repository %s" +msgstr "ユーザ がプルリクエスト #%s (リポジトリ %s) にコメントしました。" + +#: rhodecode/templates/email_templates/pull_request_comment.html:13 +#, fuzzy +msgid "Closing pull request with status" +msgstr "プルリクエストステータス" #: rhodecode/templates/email_templates/registration.html:4 msgid "A new user have registered in RhodeCode" @@ -3619,109 +3817,115 @@ msgid "View this user here" msgstr "このユーザを閲覧する" -#: rhodecode/templates/errors/error_document.html:46 +#: rhodecode/templates/errors/error_document.html:55 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "" #: rhodecode/templates/files/file_diff.html:4 -#, python-format -msgid "%s File diff" +#, fuzzy, python-format +msgid "%s File Diff" msgstr "%s ファイル差分" -#: rhodecode/templates/files/file_diff.html:12 +#: rhodecode/templates/files/file_diff.html:8 msgid "File diff" msgstr "ファイル差分" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:74 -#, python-format -msgid "%s files" +#: rhodecode/templates/files/files.html:76 +#, fuzzy, python-format +msgid "%s Files" msgstr "%s ファイル" -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:351 -msgid "files" -msgstr "ファイル" +#: rhodecode/templates/files/files.html:30 +#: rhodecode/templates/files/files_add.html:31 +#: rhodecode/templates/files/files_edit.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +#, fuzzy +msgid "Branch" +msgstr "ブランチ" #: rhodecode/templates/files/files_add.html:4 -#: rhodecode/templates/files/files_edit.html:4 -#, python-format -msgid "%s Edit file" -msgstr "" +#, fuzzy, python-format +msgid "%s Files Add" +msgstr "%s ファイル" #: rhodecode/templates/files/files_add.html:19 -msgid "add file" +#, fuzzy +msgid "Add file" msgstr "ファイルを追加" -#: rhodecode/templates/files/files_add.html:40 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:78 msgid "Add new file" msgstr "新しいファイルを追加" -#: rhodecode/templates/files/files_add.html:45 +#: rhodecode/templates/files/files_add.html:43 msgid "File Name" msgstr "ファイル名" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:56 msgid "or" msgstr "または" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:54 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:52 msgid "Upload file" msgstr "アップロード" -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:56 msgid "Create new file" msgstr "新しいファイルを作成" -#: rhodecode/templates/files/files_add.html:63 -#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_add.html:61 +#: rhodecode/templates/files/files_edit.html:37 #: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "場所" -#: rhodecode/templates/files/files_add.html:67 +#: rhodecode/templates/files/files_add.html:65 msgid "use / to separate directories" msgstr "ディレクトリの区切りには / を使います" -#: rhodecode/templates/files/files_add.html:77 -#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 #: rhodecode/templates/shortlog/shortlog_data.html:6 -msgid "commit message" +#, fuzzy +msgid "Commit message" msgstr "コミットメッセージ" -#: rhodecode/templates/files/files_add.html:81 -#: rhodecode/templates/files/files_edit.html:67 +#: rhodecode/templates/files/files_add.html:79 +#: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "変更をコミット" #: rhodecode/templates/files/files_browser.html:13 -msgid "view" +#, fuzzy +msgid "View" msgstr "閲覧" #: rhodecode/templates/files/files_browser.html:14 -msgid "previous revision" +#, fuzzy +msgid "Previous revision" msgstr "前のリビジョン" #: rhodecode/templates/files/files_browser.html:16 -msgid "next revision" +#, fuzzy +msgid "Next revision" msgstr "次のリビジョン" #: rhodecode/templates/files/files_browser.html:23 -msgid "follow current branch" +#, fuzzy +msgid "Follow current branch" msgstr "このブランチで追跡" #: rhodecode/templates/files/files_browser.html:27 -msgid "search file list" +#, fuzzy +msgid "Search file list" msgstr "ファイル一覧を検索" -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -msgid "add new file" -msgstr "新しいファイルを追加" - #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." msgstr "ファイル一覧を読み込み中..." @@ -3746,31 +3950,41 @@ msgid "Last committer" msgstr "最後の作成者" +#: rhodecode/templates/files/files_edit.html:4 +#, fuzzy, python-format +msgid "%s Files Edit" +msgstr "%s ファイル" + #: rhodecode/templates/files/files_edit.html:19 -msgid "edit file" +#, fuzzy +msgid "Edit file" msgstr "ファイルを編集" -#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -msgid "show annotation" +#, fuzzy +msgid "Show annotation" msgstr "アノテーションを表示" -#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_edit.html:48 #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 -msgid "show as raw" +#, fuzzy +msgid "Show as raw" msgstr "元のファイルを表示" -#: rhodecode/templates/files/files_edit.html:51 +#: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -msgid "download as raw" +#, fuzzy +msgid "Download as raw" msgstr "元のファイルをダウンロード" -#: rhodecode/templates/files/files_edit.html:54 -msgid "source" +#: rhodecode/templates/files/files_edit.html:52 +#, fuzzy +msgid "Source" msgstr "ソース" -#: rhodecode/templates/files/files_edit.html:59 +#: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" msgstr "ファイルを編集" @@ -3779,15 +3993,18 @@ msgstr "変更履歴" #: rhodecode/templates/files/files_history_box.html:9 -msgid "diff to revision" +#, fuzzy +msgid "Diff to revision" msgstr "このリビジョンの差分を見る" #: rhodecode/templates/files/files_history_box.html:10 -msgid "show at revision" +#, fuzzy +msgid "Show at revision" msgstr "このリビジョンを見る" #: rhodecode/templates/files/files_history_box.html:11 -msgid "show full history" +#, fuzzy +msgid "Show full history" msgstr "すべての履歴を表示" #: rhodecode/templates/files/files_history_box.html:16 @@ -3801,17 +4018,19 @@ msgstr "ファイルの履歴を読み込む" #: rhodecode/templates/files/files_source.html:21 -msgid "show source" +#, fuzzy +msgid "Show source" msgstr "ソースを表示" #: rhodecode/templates/files/files_source.html:29 #, fuzzy, python-format -msgid "edit on branch:%s" +msgid "Edit on branch:%s" msgstr "削除されたブランチ: %s" #: rhodecode/templates/files/files_source.html:31 -msgid "edit on branch:?" -msgstr "" +#, fuzzy +msgid "Edit on branch:?" +msgstr "削除されたブランチ: %s" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -3843,8 +4062,10 @@ msgid "%s Followers" msgstr "%s フォロワー" -#: rhodecode/templates/followers/followers.html:13 -msgid "followers" +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:184 +msgid "Followers" msgstr "フォロワー" #: rhodecode/templates/followers/followers_data.html:12 @@ -3856,32 +4077,33 @@ msgid "%s Fork" msgstr "%s フォーク" -#: rhodecode/templates/forks/fork.html:31 +#: rhodecode/templates/forks/fork.html:28 msgid "Fork name" msgstr "フォーク名" -#: rhodecode/templates/forks/fork.html:68 +#: rhodecode/templates/forks/fork.html:65 msgid "Private" msgstr "非公開" -#: rhodecode/templates/forks/fork.html:77 +#: rhodecode/templates/forks/fork.html:74 msgid "Copy permissions" msgstr "権限のコピー" -#: rhodecode/templates/forks/fork.html:81 +#: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" msgstr "フォーク元リポジトリから権限をコピーします" -#: rhodecode/templates/forks/fork.html:86 +#: rhodecode/templates/forks/fork.html:84 msgid "Update after clone" msgstr "クローン後にupdateする" -#: rhodecode/templates/forks/fork.html:90 +#: rhodecode/templates/forks/fork.html:88 msgid "Checkout source after making a clone" msgstr "クローンした後にソースをチェックアウトします" -#: rhodecode/templates/forks/fork.html:94 -msgid "fork this repository" +#: rhodecode/templates/forks/fork.html:93 +#, fuzzy +msgid "Fork this repository" msgstr "このリポジトリをフォーク" #: rhodecode/templates/forks/forks.html:5 @@ -3889,18 +4111,17 @@ msgid "%s Forks" msgstr "%s フォーク" -#: rhodecode/templates/forks/forks.html:13 -msgid "forks" +#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/summary/summary.html:189 +#: rhodecode/templates/summary/summary.html:190 +msgid "Forks" msgstr "フォーク" #: rhodecode/templates/forks/forks_data.html:17 -msgid "forked" +#, fuzzy +msgid "Forked" msgstr "フォークしました" -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "フォークを比較" - #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "まだフォークがありません" @@ -3914,21 +4135,15 @@ msgstr "RSS ジャーナルフィード" #: rhodecode/templates/journal/journal.html:32 -#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "更新" #: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 -msgid "RSS feed" -msgstr "RSSフィード" - -#: rhodecode/templates/journal/journal.html:38 -#: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "ATOMフィード" -#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:51 msgid "Watched" msgstr "ウォッチ" @@ -3936,6 +4151,11 @@ msgid "No entries yet" msgstr "まだエントリがありません" +#: rhodecode/templates/journal/public_journal.html:4 +#: rhodecode/templates/journal/public_journal.html:21 +msgid "Public Journal" +msgstr "公開ジャーナル" + #: rhodecode/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "ATOM 公開ジャーナルフィード" @@ -3944,151 +4164,131 @@ msgid "RSS public journal feed" msgstr "RSS 公開ジャーナルフィード" -#: rhodecode/templates/journal/public_journal.html:21 -msgid "Public Journal" -msgstr "公開ジャーナル" - #: rhodecode/templates/pullrequests/pullrequest.html:4 -#: rhodecode/templates/pullrequests/pullrequest.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" msgstr "新しいプルリクエスト" -#: rhodecode/templates/pullrequests/pullrequest.html:54 -msgid "refresh overview" -msgstr "概要の更新" - -#: rhodecode/templates/pullrequests/pullrequest.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:52 msgid "Detailed compare view" msgstr "比較ビュー詳細" -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:118 +#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "プルリクエストレビュアー" -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "所有者" -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:145 +#: rhodecode/templates/pullrequests/pullrequest.html:77 msgid "Add reviewer to this pull request." msgstr "このプルリクエストにレビュアーを追加" -#: rhodecode/templates/pullrequests/pullrequest.html:97 +#: rhodecode/templates/pullrequests/pullrequest.html:83 msgid "Create new pull request" msgstr "新しいプルリクエストを作成" -#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest.html:92 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "タイトル" -#: rhodecode/templates/pullrequests/pullrequest.html:123 +#: rhodecode/templates/pullrequests/pullrequest.html:109 msgid "Send pull request" msgstr "プルリクエストを送る" -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "Closed %s" -msgstr "%s にクローズ" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "with status %s" -msgstr "ステータス: %s" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:31 -msgid "Status" -msgstr "ステータス" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:36 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#, fuzzy, python-format +msgid "%s Pull Request #%s" +msgstr "%s プルリクエスト #%s" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#, fuzzy +msgid "Review status" +msgstr "新しいステータス" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" msgstr "プルリクエストステータス" -#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" msgstr "未レビュー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d レビュアー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 -msgid "pull request was reviewed by all reviewers" +#: rhodecode/templates/pullrequests/pullrequest_show.html:59 +#, fuzzy +msgid "Pull request was reviewed by all reviewers" msgstr "プルリクエストはすべてのレビュアーにレビューされました" -#: rhodecode/templates/pullrequests/pullrequest_show.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Origin repository" msgstr "Gitリポジトリ" -#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" msgstr "作成日" -#: rhodecode/templates/pullrequests/pullrequest_show.html:83 +#: rhodecode/templates/pullrequests/pullrequest_show.html:102 msgid "Compare view" msgstr "比較ビュー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "reviewer" msgstr "レビュアー" +#: rhodecode/templates/pullrequests/pullrequest_show.html:164 +#, fuzzy +msgid "Add or remove reviewer to this pull request." +msgstr "このプルリクエストにレビュアーを追加" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:168 +#, fuzzy +msgid "Save changes" +msgstr "変更点なし" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -msgid "all pull requests" -msgstr "すべてのプルリクエスト" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 -msgid "All pull requests" -msgstr "すべてのプルリクエスト" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 -msgid "Closed" -msgstr "クローズ" +#, fuzzy, python-format +msgid "%s Pull Requests" +msgstr "%s プルリクエスト" #: rhodecode/templates/search/search.html:6 -#, python-format -msgid "Search \"%s\" in repository: %s" -msgstr "\"%s\" を %s リポジトリから検索" +#, fuzzy +msgid "Search repository" +msgstr "%s リポジトリから検索" #: rhodecode/templates/search/search.html:8 -#, python-format -msgid "Search \"%s\" in all repositories" -msgstr "\"%s\" を全てのリポジトリから検索" - -#: rhodecode/templates/search/search.html:12 -#: rhodecode/templates/search/search.html:32 -#, python-format -msgid "Search in repository: %s" -msgstr "%s リポジトリから検索" - -#: rhodecode/templates/search/search.html:14 -#: rhodecode/templates/search/search.html:34 +#: rhodecode/templates/search/search.html:16 msgid "Search in all repositories" msgstr "全てのリポジトリから検索" -#: rhodecode/templates/search/search.html:48 +#: rhodecode/templates/search/search.html:50 msgid "Search term" msgstr "検索キーワード" -#: rhodecode/templates/search/search.html:60 +#: rhodecode/templates/search/search.html:62 msgid "Search in" msgstr "検索対象" -#: rhodecode/templates/search/search.html:63 +#: rhodecode/templates/search/search.html:65 msgid "File contents" msgstr "ファイル内容" -#: rhodecode/templates/search/search.html:64 +#: rhodecode/templates/search/search.html:66 msgid "Commit messages" msgstr "コミットメッセージ" -#: rhodecode/templates/search/search.html:65 +#: rhodecode/templates/search/search.html:67 msgid "File names" msgstr "ファイル名" @@ -4098,40 +4298,26 @@ msgid "Permission denied" msgstr "権限がありません" -#: rhodecode/templates/settings/repo_settings.html:5 -#, python-format -msgid "%s Settings" -msgstr "%s 設定" - -#: rhodecode/templates/settings/repo_settings.html:102 -msgid "Delete repository" -msgstr "リポジトリを削除" - -#: rhodecode/templates/settings/repo_settings.html:109 -msgid "Remove repo" -msgstr "削除" - #: rhodecode/templates/shortlog/shortlog.html:5 -#, python-format -msgid "%s Shortlog" -msgstr "%s 短いログ" - +#, fuzzy, python-format +msgid "%s Lightweight Changelog" +msgstr "%s 軽量ダッシュボードを使用" + +#: rhodecode/templates/shortlog/shortlog.html:11 #: rhodecode/templates/shortlog/shortlog.html:15 -#: rhodecode/templates/shortlog/shortlog.html:19 -msgid "shortlog" -msgstr "ログ" - -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "リビジョン" +#, fuzzy +msgid "Lightweight Changelog" +msgstr "軽量ダッシュボードを使用" #: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "age" +#, fuzzy +msgid "Age" msgstr "経過時間" -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "作成者" +#: rhodecode/templates/shortlog/shortlog_data.html:20 +#, fuzzy, python-format +msgid "Click to open associated pull request #%s" +msgstr "関連するプルリクエストを開く #%s" #: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" @@ -4150,156 +4336,170 @@ msgid "%s Summary" msgstr "%s 要約" -#: rhodecode/templates/summary/summary.html:12 -msgid "summary" -msgstr "要約" - -#: rhodecode/templates/summary/summary.html:20 -#, python-format -msgid "repo %s ATOM feed" -msgstr "リポジトリ %s ATOM フィード" - -#: rhodecode/templates/summary/summary.html:21 -#, python-format -msgid "repo %s RSS feed" -msgstr "リポジトリ %s RSS フィード" - -#: rhodecode/templates/summary/summary.html:49 -#: rhodecode/templates/summary/summary.html:52 -msgid "ATOM" -msgstr "ATOM" - -#: rhodecode/templates/summary/summary.html:70 +#: rhodecode/templates/summary/summary.html:16 +#, fuzzy, python-format +msgid "%s ATOM feed" +msgstr "%s フィード" + +#: rhodecode/templates/summary/summary.html:17 +#, fuzzy, python-format +msgid "%s RSS feed" +msgstr "%s フィード" + +#: rhodecode/templates/summary/summary.html:62 #, python-format msgid "Repository locked by %s" msgstr "リポジトリは %s によってロックされました" -#: rhodecode/templates/summary/summary.html:72 +#: rhodecode/templates/summary/summary.html:64 msgid "Repository unlocked" msgstr "リポジトリはロックされていません" -#: rhodecode/templates/summary/summary.html:91 +#: rhodecode/templates/summary/summary.html:83 #, python-format msgid "Non changable ID %s" msgstr "変更不能ID %s" -#: rhodecode/templates/summary/summary.html:96 -msgid "public" +#: rhodecode/templates/summary/summary.html:88 +#, fuzzy +msgid "Public" msgstr "公開" -#: rhodecode/templates/summary/summary.html:104 -msgid "remote clone" +#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:89 +msgid "Fork of" +msgstr "フォーク元: " + +#: rhodecode/templates/summary/summary.html:96 +#, fuzzy +msgid "Remote clone" msgstr "リモートクローン" -#: rhodecode/templates/summary/summary.html:125 +#: rhodecode/templates/summary/summary.html:117 msgid "Contact" msgstr "コンタクト" -#: rhodecode/templates/summary/summary.html:139 +#: rhodecode/templates/summary/summary.html:131 msgid "Clone url" msgstr "クローンURL" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:136 msgid "Show by Name" msgstr "名前で表示" -#: rhodecode/templates/summary/summary.html:143 +#: rhodecode/templates/summary/summary.html:137 msgid "Show by ID" msgstr "IDで表示" +#: rhodecode/templates/summary/summary.html:143 +msgid "Trending files" +msgstr "トレンドファイル" + #: rhodecode/templates/summary/summary.html:151 -msgid "Trending files" -msgstr "トレンドファイル" +#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "有効にする" #: rhodecode/templates/summary/summary.html:159 -#: rhodecode/templates/summary/summary.html:175 -#: rhodecode/templates/summary/summary.html:203 -msgid "enable" -msgstr "有効にする" - -#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "ダウンロード" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:163 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:165 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: rhodecode/templates/summary/summary.html:179 +#: rhodecode/templates/summary/summary.html:171 msgid "Download as zip" msgstr "ZIPとしてダウンロード" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "with subrepos" msgstr "サブリポジトリを含む" -#: rhodecode/templates/summary/summary.html:195 +#: rhodecode/templates/summary/summary.html:197 +#, fuzzy +msgid "Repository Size" +msgstr "リポジトリ" + +#: rhodecode/templates/summary/summary.html:204 +#: rhodecode/templates/summary/summary.html:206 +#, fuzzy +msgid "Feed" +msgstr "RSSフィード" + +#: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "コミットアクティビティ 日/作成者" -#: rhodecode/templates/summary/summary.html:206 +#: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "収集した統計情報: " -#: rhodecode/templates/summary/summary.html:227 -msgid "Shortlog" -msgstr "ログ" - -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:256 +#, fuzzy +msgid "Latest changes" +msgstr "最後の変更時刻" + +#: rhodecode/templates/summary/summary.html:258 msgid "Quick start" msgstr "クイックスタート" -#: rhodecode/templates/summary/summary.html:243 +#: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file at revision '%s'" msgstr "リビジョン '%s' のReadmeファイル" -#: rhodecode/templates/summary/summary.html:246 +#: rhodecode/templates/summary/summary.html:275 msgid "Permalink to this readme" msgstr "パーマリンク" -#: rhodecode/templates/summary/summary.html:304 +#: rhodecode/templates/summary/summary.html:333 #, python-format msgid "Download %s as %s" msgstr "%s を %sとしてダウンロード" -#: rhodecode/templates/summary/summary.html:661 +#: rhodecode/templates/summary/summary.html:380 +msgid "files" +msgstr "ファイル" + +#: rhodecode/templates/summary/summary.html:690 msgid "commits" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:662 +#: rhodecode/templates/summary/summary.html:691 msgid "files added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:663 +#: rhodecode/templates/summary/summary.html:692 msgid "files changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:664 +#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "削除されたファイル" -#: rhodecode/templates/summary/summary.html:667 +#: rhodecode/templates/summary/summary.html:695 msgid "commit" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:668 +#: rhodecode/templates/summary/summary.html:696 msgid "file added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:669 +#: rhodecode/templates/summary/summary.html:697 msgid "file changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:670 +#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "削除されたファイル" @@ -4308,7 +4508,7 @@ msgid "%s Tags" msgstr "%s タグ" -#: rhodecode/templates/tags/tags.html:29 +#: rhodecode/templates/tags/tags.html:26 msgid "Compare tags" msgstr "タグの比較"
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Fri Apr 05 14:09:23 2013 +0200 +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Fri Apr 05 19:21:52 2013 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-01-28 00:24+0100\n" +"POT-Creation-Date: 2013-04-05 10:19-0700\n" "PO-Revision-Date: 2013-01-20 03:44+0100\n" "Last-Translator: Nemcio <bogdan114@g.pl>\n" "Language-Team: Test\n" @@ -24,11 +24,13 @@ msgstr "Wszystkie gałęzie" #: rhodecode/controllers/changeset.py:83 -msgid "show white space" +#, fuzzy +msgid "Show white space" msgstr "pokazuj spacje" #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 -msgid "ignore white space" +#, fuzzy +msgid "Ignore white space" msgstr "ignoruj pokazywanie spacji" #: rhodecode/controllers/changeset.py:163 @@ -37,7 +39,7 @@ msgstr "%s linia w kontekście" #: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:416 +#: rhodecode/controllers/pullrequests.py:438 #, python-format msgid "Status change -> %s" msgstr "Zmiana statusu -> %s" @@ -50,8 +52,8 @@ "Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest " "niedozwolona" -#: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:121 +#: rhodecode/controllers/compare.py:74 +#: rhodecode/controllers/pullrequests.py:167 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" @@ -97,107 +99,118 @@ msgstr "%s %s zasilać" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:137 -#: rhodecode/templates/changeset/changeset.html:149 -#: rhodecode/templates/compare/compare_diff.html:62 -#: rhodecode/templates/compare/compare_diff.html:73 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 -#: rhodecode/templates/pullrequests/pullrequest_show.html:171 +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Changeset was too big and was cut off..." msgstr "Lista zmian była zbyt duża i została ucięta..." -#: rhodecode/controllers/feed.py:92 -msgid "commited on" -msgstr "komunikaty w" - -#: rhodecode/controllers/files.py:86 -msgid "click here to add new file" +#: rhodecode/controllers/feed.py:91 +#, fuzzy, python-format +msgid "%s committed on %s" +msgstr "%s zakomitowal w %s" + +#: rhodecode/controllers/files.py:88 +#, fuzzy +msgid "Click here to add new file" msgstr "Kliknij tutaj, by dodać nowy plik" -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/files.py:89 #, python-format msgid "There are no files yet %s" msgstr "Brak plików %s" -#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338 +#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "Repozytorium zostało zablokowane przez %s na %s" -#: rhodecode/controllers/files.py:281 +#: rhodecode/controllers/files.py:279 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:295 +#: rhodecode/controllers/files.py:293 #, fuzzy, python-format msgid "Edited file %s via RhodeCode" msgstr "Edytowanie %s w RhodeCode" -#: rhodecode/controllers/files.py:311 +#: rhodecode/controllers/files.py:309 msgid "No changes" msgstr "Bez zmian" -#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384 +#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 #, python-format msgid "Successfully committed to %s" msgstr "Committ wykonany do %s" -#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390 +#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: rhodecode/controllers/files.py:350 +#: rhodecode/controllers/files.py:347 #, fuzzy msgid "Added file via RhodeCode" msgstr "Dodano %s poprzez RhodeCode" -#: rhodecode/controllers/files.py:370 +#: rhodecode/controllers/files.py:364 msgid "No content" msgstr "Brak treści" -#: rhodecode/controllers/files.py:374 +#: rhodecode/controllers/files.py:368 msgid "No filename" msgstr "Brak nazwy pliku" -#: rhodecode/controllers/files.py:416 -msgid "downloads disabled" +#: rhodecode/controllers/files.py:372 +msgid "Location must be relative path and must not contain .. in path" +msgstr "" + +#: rhodecode/controllers/files.py:420 +#, fuzzy +msgid "Downloads disabled" msgstr "Pobieranie wyłączone" -#: rhodecode/controllers/files.py:427 +#: rhodecode/controllers/files.py:431 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: rhodecode/controllers/files.py:429 +#: rhodecode/controllers/files.py:433 msgid "Empty repository" msgstr "Puste repozytorium" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:435 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" -#: rhodecode/controllers/files.py:576 -#: rhodecode/templates/changeset/changeset_range.html:13 -#: rhodecode/templates/changeset/changeset_range.html:31 +#: rhodecode/controllers/files.py:617 +#: rhodecode/templates/changeset/changeset_range.html:9 msgid "Changesets" msgstr "Różnice" -#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564 +#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 +#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "Gałęzie" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78 -#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575 +#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 +#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "Etykiety" -#: rhodecode/controllers/forks.py:165 -#, python-format -msgid "forked %s repository as %s" +#: rhodecode/controllers/forks.py:175 +#, fuzzy, python-format +msgid "Forked repository %s as %s" msgstr "gałęzi %s w repozytorium %s" -#: rhodecode/controllers/forks.py:179 +#: rhodecode/controllers/forks.py:189 #, python-format msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" @@ -207,50 +220,72 @@ msgstr "Dziennik publiczny" #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 -#: rhodecode/templates/base/base.html:238 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "dziennik" -#: rhodecode/controllers/login.py:142 -msgid "You have successfully registered into rhodecode" +#: rhodecode/controllers/login.py:138 +#, fuzzy +msgid "You have successfully registered into RhodeCode" msgstr "Udało Ci się zarejestrować na stronie" -#: rhodecode/controllers/login.py:163 +#: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" msgstr "Twój link zresetowania hasła został wysłany" -#: rhodecode/controllers/login.py:183 +#: rhodecode/controllers/login.py:179 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" -#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570 +#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/email_templates/changeset_comment.html:15 +msgid "Changeset" +msgstr "Grupy zmian" + +#: rhodecode/controllers/pullrequests.py:128 +msgid "Special" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:129 +#, fuzzy +msgid "Peer branches" +msgstr "gałęzie" + +#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Zakładki" -#: rhodecode/controllers/pullrequests.py:190 +#: rhodecode/controllers/pullrequests.py:228 msgid "Pull request requires a title with min. 3 chars" msgstr "Wniosek połączenia gałęzi wymaga tytułu z min. 3 znakami" -#: rhodecode/controllers/pullrequests.py:192 -msgid "error during creation of pull request" +#: rhodecode/controllers/pullrequests.py:230 +#, fuzzy +msgid "Error creating pull request" msgstr "błąd podczas tworzenia prośby o łączenie gałęzi" -#: rhodecode/controllers/pullrequests.py:224 +#: rhodecode/controllers/pullrequests.py:251 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:227 +#: rhodecode/controllers/pullrequests.py:254 msgid "Error occurred during sending pull request" msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" -#: rhodecode/controllers/pullrequests.py:260 +#: rhodecode/controllers/pullrequests.py:287 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:451 +#: rhodecode/controllers/pullrequests.py:441 +msgid "Closing with" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:478 #, fuzzy msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" @@ -269,55 +304,12 @@ msgid "An error occurred during this search operation" msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" -#: rhodecode/controllers/settings.py:120 -#: rhodecode/controllers/admin/repos.py:254 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" - -#: rhodecode/controllers/settings.py:138 -#: rhodecode/controllers/admin/repos.py:272 -#, python-format -msgid "error occurred during update of repository %s" -msgstr "wystąpił błąd podczas aktualizacji repozytorium %s" - -#: rhodecode/controllers/settings.py:163 -#: rhodecode/controllers/admin/repos.py:297 -#, python-format -msgid "deleted repository %s" -msgstr "usunięte repozytorium %s" - -#: rhodecode/controllers/settings.py:167 -#: rhodecode/controllers/admin/repos.py:307 -#: rhodecode/controllers/admin/repos.py:313 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Wystąpił błąd podczas usuwania %s" - -#: rhodecode/controllers/settings.py:186 -msgid "unlocked" -msgstr "Odblokowany" - -#: rhodecode/controllers/settings.py:189 -msgid "locked" -msgstr "zablokowany" - -#: rhodecode/controllers/settings.py:191 -#, python-format -msgid "Repository has been %s" -msgstr "Repozytoriów jest %s" - -#: rhodecode/controllers/settings.py:195 -#: rhodecode/controllers/admin/repos.py:405 -msgid "An error occurred during unlocking" -msgstr "Wystąpił błąd podczas odblokowywania" - -#: rhodecode/controllers/summary.py:140 +#: rhodecode/controllers/summary.py:141 msgid "No data loaded yet" msgstr "Żadne dane nie zostały załadowane" -#: rhodecode/controllers/summary.py:144 -#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/controllers/summary.py:147 +#: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" @@ -326,7 +318,8 @@ msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" #: rhodecode/controllers/admin/defaults.py:110 -msgid "error occurred during update of defaults" +#, fuzzy +msgid "Error occurred during update of defaults" msgstr "wystąpił błąd podczas aktualizacji wartości domyślnych" #: rhodecode/controllers/admin/ldap_settings.py:50 @@ -382,7 +375,8 @@ msgstr "Nie można uaktywnić ldap.\"Python-ldap\" brakuje library." #: rhodecode/controllers/admin/ldap_settings.py:147 -msgid "error occurred during update of ldap settings" +#, fuzzy +msgid "Error occurred during update of ldap settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień ldap" #: rhodecode/controllers/admin/permissions.py:60 @@ -405,45 +399,46 @@ #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 -#: rhodecode/templates/admin/repos/repo_add.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:9 +#: rhodecode/templates/admin/repos/repo_add.html:10 +#: rhodecode/templates/admin/repos/repo_add.html:14 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:133 #: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/admin/users/users.html:85 #: 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:203 -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 +#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:300 msgid "Admin" msgstr "Administracja" #: rhodecode/controllers/admin/permissions.py:70 -msgid "disabled" -msgstr "wyłączona" - -#: rhodecode/controllers/admin/permissions.py:72 -msgid "allowed with manual account activation" -msgstr "dozwolona z ręczną aktywacją konta" - -#: rhodecode/controllers/admin/permissions.py:74 -msgid "allowed with automatic account activation" -msgstr "dozwolona z automatyczną aktywacją konta" - #: rhodecode/controllers/admin/permissions.py:76 #: rhodecode/controllers/admin/permissions.py:79 msgid "Disabled" msgstr "Wyłączone" +#: rhodecode/controllers/admin/permissions.py:72 +#, fuzzy +msgid "Allowed with manual account activation" +msgstr "dozwolona z ręczną aktywacją konta" + +#: rhodecode/controllers/admin/permissions.py:74 +#, fuzzy +msgid "Allowed with automatic account activation" +msgstr "dozwolona z automatyczną aktywacją konta" + #: rhodecode/controllers/admin/permissions.py:77 #: rhodecode/controllers/admin/permissions.py:80 msgid "Enabled" @@ -454,156 +449,233 @@ msgstr "Domyślne uprawnienia zaktualizowane pomyślnie" #: rhodecode/controllers/admin/permissions.py:142 -msgid "error occurred during update of permissions" +#, fuzzy +msgid "Error occurred during update of permissions" msgstr "wystąpił błąd podczas aktualizacji uprawnień" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:127 msgid "--REMOVE FORK--" msgstr "--USUŃ ROZGAŁĘZIENIE--" -#: rhodecode/controllers/admin/repos.py:162 -#, python-format -msgid "created repository %s from %s" +#: rhodecode/controllers/admin/repos.py:168 +#, fuzzy, python-format +msgid "Created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: rhodecode/controllers/admin/repos.py:166 -#, python-format -msgid "created repository %s" +#: rhodecode/controllers/admin/repos.py:174 +#, fuzzy, python-format +msgid "Created repository %s" msgstr "utworzone repozytorium %s" #: rhodecode/controllers/admin/repos.py:197 +#, fuzzy, python-format +msgid "Error creating repository %s" +msgstr "utworzone repozytorium %s" + +#: rhodecode/controllers/admin/repos.py:266 #, python-format -msgid "error occurred during creation of repository %s" -msgstr "wystąpił błąd podczas tworzenia repozytorium %s" - -#: rhodecode/controllers/admin/repos.py:302 +msgid "Repository %s updated successfully" +msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" + +#: rhodecode/controllers/admin/repos.py:284 +#, fuzzy, python-format +msgid "Error occurred during update of repository %s" +msgstr "wystąpił błąd podczas aktualizacji repozytorium %s" + +#: rhodecode/controllers/admin/repos.py:311 +#: rhodecode/controllers/api/api.py:877 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/api/api.py:879 +#, fuzzy, python-format +msgid "Deleted %s forks" +msgstr "usunięte repozytorium %s" + +#: rhodecode/controllers/admin/repos.py:319 +#, fuzzy, python-format +msgid "Deleted repository %s" +msgstr "usunięte repozytorium %s" + +#: rhodecode/controllers/admin/repos.py:322 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:327 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "Wystąpił błąd podczas usuwania %s" + +#: rhodecode/controllers/admin/repos.py:365 +#, fuzzy +msgid "Repository permissions updated" +msgstr "Repozytorium wyłączone" + +#: rhodecode/controllers/admin/repos.py:384 msgid "An error occurred during deletion of repository user" msgstr "Wystąpił błąd podczas usunięcia użytkownika z repozytorium" -#: rhodecode/controllers/admin/repos.py:350 -msgid "An error occurred during deletion of repository users groups" +#: rhodecode/controllers/admin/repos.py:403 +#, fuzzy +msgid "An error occurred during deletion of repository user groups" msgstr "Wystąpił błąd podczas usunięcia grupy użytkowników z repozytorium" -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:421 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:438 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: rhodecode/controllers/admin/repos.py:425 +#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:485 +msgid "An error occurred during unlocking" +msgstr "Wystąpił błąd podczas odblokowywania" + +#: rhodecode/controllers/admin/repos.py:476 +#, fuzzy +msgid "Unlocked" +msgstr "Odblokowany" + +#: rhodecode/controllers/admin/repos.py:479 +#, fuzzy +msgid "Locked" +msgstr "zablokowany" + +#: rhodecode/controllers/admin/repos.py:481 +#, python-format +msgid "Repository has been %s" +msgstr "Repozytoriów jest %s" + +#: rhodecode/controllers/admin/repos.py:505 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:509 msgid "An error occurred during setting this repository in public journal" msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" -#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301 +#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "Niezgodność tokenu" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:527 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:449 +#: rhodecode/controllers/admin/repos.py:529 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:545 msgid "Nothing" msgstr "Brak" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:547 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: rhodecode/controllers/admin/repos.py:471 +#: rhodecode/controllers/admin/repos.py:551 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" -#: rhodecode/controllers/admin/repos_groups.py:136 -#, python-format -msgid "created repos group %s" +#: rhodecode/controllers/admin/repos.py:590 +#, fuzzy +msgid "An error occurred during creation of field" +msgstr "wystąpił błąd podczas tworzenia użytkownika %s" + +#: rhodecode/controllers/admin/repos.py:604 +#, fuzzy +msgid "An error occurred during removal of field" +msgstr "Wystąpił błąd podczas zapisywania e-maila" + +#: rhodecode/controllers/admin/repos_groups.py:145 +#, fuzzy, python-format +msgid "Created repository group %s" msgstr "utworzono grupę repo %s" -#: rhodecode/controllers/admin/repos_groups.py:148 -#, python-format -msgid "error occurred during creation of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:157 +#, fuzzy, python-format +msgid "Error occurred during creation of repository group %s" msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" -#: rhodecode/controllers/admin/repos_groups.py:205 -#, python-format -msgid "updated repos group %s" -msgstr "zaktualizowano grupę repo %s" +#: rhodecode/controllers/admin/repos_groups.py:214 +#: rhodecode/controllers/admin/repos_groups.py:286 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:220 -#, python-format -msgid "error occurred during update of repos group %s" +#, fuzzy, python-format +msgid "Updated repository group %s" +msgstr "zaktualizowano grupę repo %s" + +#: rhodecode/controllers/admin/repos_groups.py:235 +#, fuzzy, python-format +msgid "Error occurred during update of repository group %s" msgstr "wystąpił błąd podczas aktualizacji grupy repo %s" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:253 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" -#: rhodecode/controllers/admin/repos_groups.py:246 -#, python-format -msgid "removed repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:260 +#, fuzzy, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" + +#: rhodecode/controllers/admin/repos_groups.py:266 +#, fuzzy, python-format +msgid "Removed repository group %s" msgstr "usunięto grupę repo %s" -#: rhodecode/controllers/admin/repos_groups.py:252 -msgid "Cannot delete this group it still contains subgroups" -msgstr "Nie można usunąć tej grupy ponieważ nadal zawiera podgrupy" - -#: rhodecode/controllers/admin/repos_groups.py:257 -#: rhodecode/controllers/admin/repos_groups.py:262 -#, python-format -msgid "error occurred during deletion of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:271 +#, fuzzy, python-format +msgid "Error occurred during deletion of repos group %s" msgstr "wystąpił błąd podczas kasowania grupy repo %s" -#: rhodecode/controllers/admin/repos_groups.py:283 +#: rhodecode/controllers/admin/repos_groups.py:297 msgid "An error occurred during deletion of group user" msgstr "Wystąpił błąd podczas usunięcia grupy użytkowników" -#: rhodecode/controllers/admin/repos_groups.py:304 -msgid "An error occurred during deletion of group users groups" +#: rhodecode/controllers/admin/repos_groups.py:318 +#, fuzzy +msgid "An error occurred during deletion of group user groups" msgstr "Wystąpił błąd podczas usuwania grup i grup użytkowników" -#: rhodecode/controllers/admin/settings.py:124 +#: rhodecode/controllers/admin/settings.py:126 #, fuzzy, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, " "usunięto: %s" -#: rhodecode/controllers/admin/settings.py:133 +#: rhodecode/controllers/admin/settings.py:135 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" -#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:166 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:170 #: rhodecode/controllers/admin/settings.py:301 -msgid "error occurred during updating application settings" +#, fuzzy +msgid "Error occurred during updating application settings" msgstr "wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:209 +#: rhodecode/controllers/admin/settings.py:216 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: rhodecode/controllers/admin/settings.py:214 -msgid "error occurred during updating visualisation settings" +#: rhodecode/controllers/admin/settings.py:221 +#, fuzzy +msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" #: rhodecode/controllers/admin/settings.py:297 @@ -619,37 +691,38 @@ msgstr "Aktualizacja hooku" #: rhodecode/controllers/admin/settings.py:327 -msgid "error occurred during hook creation" +#, fuzzy +msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" #: rhodecode/controllers/admin/settings.py:346 msgid "Email task created" msgstr "E-mail został wysłany" -#: rhodecode/controllers/admin/settings.py:408 +#: rhodecode/controllers/admin/settings.py:410 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: rhodecode/controllers/admin/settings.py:448 +#: rhodecode/controllers/admin/settings.py:452 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" -#: rhodecode/controllers/admin/settings.py:463 +#: rhodecode/controllers/admin/settings.py:467 #: rhodecode/controllers/admin/users.py:198 -#, python-format -msgid "error occurred during update of user %s" +#, fuzzy, python-format +msgid "Error occurred during update of user %s" msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" #: rhodecode/controllers/admin/users.py:130 -#, python-format -msgid "created user %s" +#, fuzzy, python-format +msgid "Created user %s" msgstr "utworzono użytkownika %s" #: rhodecode/controllers/admin/users.py:142 -#, python-format -msgid "error occurred during creation of user %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user %s" msgstr "wystąpił błąd podczas tworzenia użytkownika %s" #: rhodecode/controllers/admin/users.py:176 @@ -657,7 +730,8 @@ msgstr "Użytkownik został zaktualizowany" #: rhodecode/controllers/admin/users.py:214 -msgid "successfully deleted user" +#, fuzzy +msgid "Successfully deleted user" msgstr "użytkownik został usunięty" #: rhodecode/controllers/admin/users.py:219 @@ -685,7 +759,7 @@ msgstr "Cofnięto użytkownikowi uprawnienie do 'tworzenia rozgałęzień'" #: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:279 +#: rhodecode/controllers/admin/users_groups.py:281 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" @@ -718,223 +792,231 @@ msgstr "Usunięto e-mail użytkownikowi" #: rhodecode/controllers/admin/users_groups.py:86 -#, python-format -msgid "created users group %s" +#, fuzzy, python-format +msgid "Created user group %s" msgstr "utworzono grupę użytkowników %s" #: rhodecode/controllers/admin/users_groups.py:97 -#, python-format -msgid "error occurred during creation of users group %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user group %s" msgstr "wystąpił błąd podczas tworzenia grupy użytkowników %s" -#: rhodecode/controllers/admin/users_groups.py:164 -#, python-format -msgid "updated users group %s" +#: rhodecode/controllers/admin/users_groups.py:166 +#, fuzzy, python-format +msgid "Updated user group %s" msgstr "zaktualizowano grupę użytkowników %s" -#: rhodecode/controllers/admin/users_groups.py:186 -#, python-format -msgid "error occurred during update of users group %s" +#: rhodecode/controllers/admin/users_groups.py:188 +#, fuzzy, python-format +msgid "Error occurred during update of user group %s" msgstr "wystąpił błąd podczas aktualizacji grupy użytkowników %s" -#: rhodecode/controllers/admin/users_groups.py:203 -msgid "successfully deleted users group" +#: rhodecode/controllers/admin/users_groups.py:205 +#, fuzzy +msgid "Successfully deleted user group" msgstr "grupa użytkowników została usunięta z powodzeniem" -#: rhodecode/controllers/admin/users_groups.py:208 -msgid "An error occurred during deletion of users group" +#: rhodecode/controllers/admin/users_groups.py:210 +#, fuzzy +msgid "An error occurred during deletion of user group" msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" -#: rhodecode/controllers/admin/users_groups.py:257 -msgid "Granted 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:259 +#, fuzzy +msgid "Granted 'repository create' permission to user group" msgstr "Przyznano grupie użytkowników uprawnienia do 'tworzenia repozytorium'" -#: rhodecode/controllers/admin/users_groups.py:262 -msgid "Revoked 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:264 +#, fuzzy +msgid "Revoked 'repository create' permission to user group" msgstr "Cofnięto grupie użytkowników uprawnienia do 'tworzenia repozytorium'" -#: rhodecode/controllers/admin/users_groups.py:268 -msgid "Granted 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:270 +#, fuzzy +msgid "Granted 'repository fork' permission to user group" msgstr "Przyznano grupie użytkowników uprawnienia do 'tworzenia rozgałęzień'" -#: rhodecode/controllers/admin/users_groups.py:273 -msgid "Revoked 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:275 +#, fuzzy +msgid "Revoked 'repository fork' permission to user group" msgstr "Cofnięto grupie użytkowników uprawnienia do 'tworzenia rozgałęzień'" -#: rhodecode/lib/auth.py:509 +#: rhodecode/lib/auth.py:530 #, fuzzy, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: rhodecode/lib/auth.py:558 +#: rhodecode/lib/auth.py:579 msgid "You need to be a registered user to perform this action" msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie" -#: rhodecode/lib/auth.py:599 +#: rhodecode/lib/auth.py:620 msgid "You need to be a signed in to view this page" msgstr "Musisz być zalogowany, żeby oglądać stronę" -#: rhodecode/lib/diffs.py:74 -msgid "binary file" +#: rhodecode/lib/diffs.py:66 +#, fuzzy +msgid "Binary file" msgstr "plik binarny" -#: rhodecode/lib/diffs.py:90 +#: rhodecode/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby " "wyświetlić różnice" -#: rhodecode/lib/diffs.py:100 +#: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "Nie wykryto zmian" -#: rhodecode/lib/helpers.py:374 +#: rhodecode/lib/helpers.py:394 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%d.%m.%Y, %H:%M:%S" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:506 msgid "True" msgstr "Prawda" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:509 msgid "False" msgstr "Fałsz" -#: rhodecode/lib/helpers.py:530 +#: rhodecode/lib/helpers.py:547 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: rhodecode/lib/helpers.py:533 +#: rhodecode/lib/helpers.py:550 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:563 msgid "Changeset not found" msgstr "Nie znaleziono changeset" -#: rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:621 msgid "compare view" msgstr "Wyświetl porównanie" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:641 msgid "and" msgstr "i" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:642 #, python-format msgid "%s more" msgstr "%s więcej" -#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 msgid "revisions" msgstr "rewizja" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:667 #, python-format msgid "fork name %s" msgstr "nazwa rozgałęzienia %s" -#: rhodecode/lib/helpers.py:658 -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/lib/helpers.py:684 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "Połączonych gałęzi #%s" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:690 msgid "[deleted] repository" msgstr "[usunięte] repozytorium" -#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 +#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 msgid "[created] repository" msgstr "[utworzone] repozytorium" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:694 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 +#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 msgid "[forked] repository" msgstr "[rozgałęzione] repozytorium" -#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 +#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 msgid "[updated] repository" msgstr "[zaktualizowane] repozytorium" -#: rhodecode/lib/helpers.py:674 +#: rhodecode/lib/helpers.py:700 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: rhodecode/lib/helpers.py:682 +#: rhodecode/lib/helpers.py:708 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:710 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: rhodecode/lib/helpers.py:686 -msgid "[created] users group" +#: rhodecode/lib/helpers.py:712 +#, fuzzy +msgid "[created] user group" msgstr "[utworzona] grupa użytkowników" -#: rhodecode/lib/helpers.py:688 -msgid "[updated] users group" +#: rhodecode/lib/helpers.py:714 +#, fuzzy +msgid "[updated] user group" msgstr "[zaktualizowana] grupa użytkowników" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:716 msgid "[commented] on revision in repository" msgstr "[komentarz] do zmiany w repozytorium" -#: rhodecode/lib/helpers.py:692 +#: rhodecode/lib/helpers.py:718 msgid "[commented] on pull request for" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:720 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: rhodecode/lib/helpers.py:696 +#: rhodecode/lib/helpers.py:722 msgid "[pushed] into" msgstr "[wysłane zmiany] w" -#: rhodecode/lib/helpers.py:698 +#: rhodecode/lib/helpers.py:724 msgid "[committed via RhodeCode] into repository" msgstr "[committed przez RhodeCode] do repozytorium" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:726 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:728 msgid "[pulled] from" msgstr "[pobrano] z" -#: rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:730 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:732 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: rhodecode/lib/helpers.py:884 +#: rhodecode/lib/helpers.py:910 #, python-format msgid " and %s more" msgstr "i %s więcej" -#: rhodecode/lib/helpers.py:888 +#: rhodecode/lib/helpers.py:914 msgid "No Files" msgstr "Brak Plików" -#: rhodecode/lib/helpers.py:1164 +#: rhodecode/lib/helpers.py:1198 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -945,7 +1027,12 @@ "zmienione z systemie plików proszę uruchomić aplikację ponownie, aby " "ponownie przeskanować repozytoria" -#: rhodecode/lib/utils2.py:403 +#: rhodecode/lib/unionrepo.py:193 +#, fuzzy +msgid "cannot create new union repository" +msgstr "[utworzone] repozytorium" + +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d year" msgid_plural "%d years" @@ -953,7 +1040,7 @@ msgstr[1] "%d lata" msgstr[2] "%d lat" -#: rhodecode/lib/utils2.py:404 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d month" msgid_plural "%d months" @@ -961,7 +1048,7 @@ msgstr[1] "%d miesięcy" msgstr[2] "%d miesięcy" -#: rhodecode/lib/utils2.py:405 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d day" msgid_plural "%d days" @@ -969,7 +1056,7 @@ msgstr[1] "%d dni" msgstr[2] "%d dni" -#: rhodecode/lib/utils2.py:406 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -977,7 +1064,7 @@ msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: rhodecode/lib/utils2.py:407 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -985,7 +1072,7 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: rhodecode/lib/utils2.py:408 +#: rhodecode/lib/utils2.py:416 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -993,143 +1080,183 @@ msgstr[1] "%d sekund" msgstr[2] "%d sekund" -#: rhodecode/lib/utils2.py:424 +#: rhodecode/lib/utils2.py:432 #, python-format msgid "in %s" msgstr "w %s" -#: rhodecode/lib/utils2.py:426 +#: rhodecode/lib/utils2.py:434 #, python-format msgid "%s ago" msgstr "%s temu" -#: rhodecode/lib/utils2.py:428 +#: rhodecode/lib/utils2.py:436 #, python-format msgid "in %s and %s" msgstr "w %s i %s" -#: rhodecode/lib/utils2.py:431 +#: rhodecode/lib/utils2.py:439 #, python-format msgid "%s and %s ago" msgstr "%s i %s temu" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:442 msgid "just now" msgstr "przed chwilą" -#: rhodecode/lib/celerylib/tasks.py:270 -msgid "password reset link" -msgstr "łącze resetowania hasła" - #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 msgid "Repository no access" msgstr "Brak dostępu do repozytorium" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 msgid "Repository read access" msgstr "Repozytorium do odczytu" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 msgid "Repository write access" msgstr "Repozytorium do zapisu" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 msgid "Repository admin access" msgstr "Administracja dostępu do repozytorium" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 msgid "Repositories Group no access" msgstr "Grupy repozytoriów brak dostępu" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 msgid "Repositories Group read access" msgstr "Grupy repozytoriów dostęp do odczytu" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 msgid "Repositories Group write access" msgstr "Grupy repozytoriów dostęp do zapisu" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 msgid "Repositories Group admin access" msgstr "Repozytoria Grupy dostęp administratora" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 msgid "RhodeCode Administrator" msgstr "Administrator Repo" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 msgid "Repository creation disabled" msgstr "Repozytorium wyłączone" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 msgid "Repository creation enabled" msgstr "Repozytorium włączone" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 msgid "Repository forking disabled" msgstr "Rozwidlenie repozytorium wyłączone" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 msgid "Repository forking enabled" msgstr "Rozwidlenie repozytorium włączone" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 msgid "Register disabled" msgstr "Rejestracja wyłączona" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 msgid "Not Reviewed" msgstr "Brak Korekty" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 msgid "Approved" msgstr "Zaakceptowano" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 msgid "Rejected" msgstr "Odrzucono" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 msgid "Under Review" msgstr "Objęty Przeglądem" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "widziany %s" -#: rhodecode/model/comment.py:176 +#: rhodecode/model/comment.py:219 msgid "[Mention]" msgstr "[Wymieniony]" +#: rhodecode/model/db.py:1252 +msgid "top level" +msgstr "" + +#: rhodecode/model/db.py:1393 +#, fuzzy +msgid "Repository group no access" +msgstr "Grupy repozytoriów brak dostępu" + +#: rhodecode/model/db.py:1394 +#, fuzzy +msgid "Repository group read access" +msgstr "Grupy repozytoriów dostęp do odczytu" + +#: rhodecode/model/db.py:1395 +#, fuzzy +msgid "Repository group write access" +msgstr "Grupy repozytoriów dostęp do zapisu" + +#: rhodecode/model/db.py:1396 +#, fuzzy +msgid "Repository group admin access" +msgstr "Repozytoria Grupy dostęp administratora" + #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "Wpisz login" @@ -1148,62 +1275,63 @@ msgid "Enter %(min)i characters or more" msgstr "Wpisz %(min)i lub więcej znaków" -#: rhodecode/model/notification.py:220 -#, python-format -msgid "commented on commit at %(when)s" -msgstr "skomentował zatwierdzenie %(when)s" - -#: rhodecode/model/notification.py:221 -#, python-format -msgid "sent message at %(when)s" -msgstr "wysłano wiadomość do %(when)s" - -#: rhodecode/model/notification.py:222 -#, python-format -msgid "mentioned you at %(when)s" -msgstr "wspomniał o Tobie w %(when)s" - -#: rhodecode/model/notification.py:223 -#, python-format -msgid "registered in RhodeCode at %(when)s" -msgstr "zarejestrowany na stronie w %(when)s" - #: rhodecode/model/notification.py:224 -#, python-format -msgid "opened new pull request at %(when)s" -msgstr "otworzył nowe połączenie gałęzi w %(when)s" +#, fuzzy, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "%(user)s skomentował zatwierdzenie %(when)s" #: rhodecode/model/notification.py:225 -#, python-format -msgid "commented on pull request at %(when)s" -msgstr "skomentował nowe połączenie gałęzi w %(when)s" - -#: rhodecode/model/pull_request.py:100 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_id)s" -msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s" - -#: rhodecode/model/scm.py:556 +#, fuzzy, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "%(user)s wysłał wiadomość do %(when)s" + +#: rhodecode/model/notification.py:226 +#, fuzzy, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "%(user)s wspomniał o Tobie w %(when)s" + +#: rhodecode/model/notification.py:227 +#, fuzzy, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "%(user)s zarejestrował na stronie w %(when)s" + +#: rhodecode/model/notification.py:228 +#, fuzzy, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" + +#: rhodecode/model/notification.py:229 +#, fuzzy, python-format +msgid "%(user)s commented on pull request at %(when)s" +msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" + +#: rhodecode/model/pull_request.py:104 +#, fuzzy, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" +msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" + +#: rhodecode/model/scm.py:598 msgid "latest tip" msgstr "ostatni tip" -#: rhodecode/model/user.py:231 -msgid "new user registration" +#: rhodecode/model/user.py:232 +#, fuzzy +msgid "New user registration" msgstr "nowy użytkownik się zarejestrował" -#: rhodecode/model/user.py:256 rhodecode/model/user.py:280 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: rhodecode/model/user.py:302 +#: rhodecode/model/user.py:303 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: rhodecode/model/user.py:308 +#: rhodecode/model/user.py:309 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1212,21 +1340,36 @@ "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38 +#: rhodecode/model/user.py:334 +#, fuzzy +msgid "Password reset link" +msgstr "łącze resetowania hasła" + +#: rhodecode/model/user.py:366 +#, fuzzy +msgid "Your new password" +msgstr "Nowe hasło" + +#: rhodecode/model/user.py:367 +#, python-format +msgid "Your new RhodeCode password:%s" +msgstr "" + +#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" msgstr "Wartość listy nie może być pusta" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Użytkownik \"%(username)s\" już istnieje" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona" -#: rhodecode/model/validators.py:88 +#: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" @@ -1234,121 +1377,129 @@ "Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia," " kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" -#: rhodecode/model/validators.py:116 +#: rhodecode/model/validators.py:117 #, python-format msgid "Username %(username)s is not valid" msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" -#: rhodecode/model/validators.py:135 -msgid "Invalid users group name" +#: rhodecode/model/validators.py:136 +#, fuzzy +msgid "Invalid user group name" msgstr "Niewłaściwa nazwa grupy" -#: rhodecode/model/validators.py:136 -#, python-format -msgid "Users group \"%(usersgroup)s\" already exists" -msgstr "Nazwa grupy \"%(usersgroup)s\" już istnieje" - -#: rhodecode/model/validators.py:138 +#: rhodecode/model/validators.py:137 +#, fuzzy, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "Nazwa grupy \"%(usergroup)s\" już istnieje" + +#: rhodecode/model/validators.py:139 +#, fuzzy msgid "" -"users group name may only contain alphanumeric characters underscores, " +"user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" "Nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, " "kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" -#: rhodecode/model/validators.py:176 +#: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" msgstr "Nie można przypisać do tej grupy jako rodzic" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Nazwa grupy \"%(group_name)s\" już istnieje" -#: rhodecode/model/validators.py:179 +#: rhodecode/model/validators.py:180 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Repozytorium o nazwie \"%(group_name)s\" już istnieje" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:238 msgid "Invalid characters (non-ascii) in password" msgstr "Nieprawidłowe znaki (nie-ascii) w haśle" -#: rhodecode/model/validators.py:252 +#: rhodecode/model/validators.py:253 msgid "Passwords do not match" msgstr "Hasła różnią się" -#: rhodecode/model/validators.py:269 +#: rhodecode/model/validators.py:270 msgid "invalid password" msgstr "nieprawidłowe hasło" -#: rhodecode/model/validators.py:270 +#: rhodecode/model/validators.py:271 msgid "invalid user name" msgstr "niepoprawna nazwa użytkownika" -#: rhodecode/model/validators.py:271 +#: rhodecode/model/validators.py:272 msgid "Your account is disabled" msgstr "Twoje konto jest wyłączone" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Nazwa repozytorium %(repo)s jest zabroniona" -#: rhodecode/model/validators.py:317 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "Repozytorium o nazwie %(repo)s już istnieje" - #: rhodecode/model/validators.py:318 #, python-format +msgid "Repository named %(repo)s already exists" +msgstr "Repozytorium o nazwie %(repo)s już istnieje" + +#: rhodecode/model/validators.py:319 +#, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Repozytorium \"%(repo)s\" już istnieje w grupie \"%(group)s\"" -#: rhodecode/model/validators.py:320 -#, python-format -msgid "Repositories group with name \"%(repo)s\" already exists" +#: rhodecode/model/validators.py:321 +#, fuzzy, python-format +msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje" -#: rhodecode/model/validators.py:433 +#: rhodecode/model/validators.py:438 msgid "invalid clone url" msgstr "nieprawidłowe url klonowania" -#: rhodecode/model/validators.py:434 +#: rhodecode/model/validators.py:439 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "Nieprawidłowe url klonowania, wstaw prawidłowy url http(s)/svn+http(s)" -#: rhodecode/model/validators.py:459 +#: rhodecode/model/validators.py:464 msgid "Fork have to be the same type as parent" msgstr "Fork musi być tego samego typu, jak rodzic" -#: rhodecode/model/validators.py:474 +#: rhodecode/model/validators.py:479 msgid "You don't have permissions to create repository in this group" msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: rhodecode/model/validators.py:501 +#: rhodecode/model/validators.py:481 +#, fuzzy +msgid "no permission to create repository in root location" +msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" + +#: rhodecode/model/validators.py:518 #, fuzzy msgid "You don't have permissions to create a group in this location" msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: rhodecode/model/validators.py:540 -msgid "This username or users group name is not valid" +#: rhodecode/model/validators.py:557 +#, fuzzy +msgid "This username or user group name is not valid" msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa" -#: rhodecode/model/validators.py:636 +#: rhodecode/model/validators.py:650 msgid "This is not a valid path" msgstr "To nie jest prawidłowa ścieżka" -#: rhodecode/model/validators.py:651 +#: rhodecode/model/validators.py:665 msgid "This e-mail address is already taken" msgstr "Ten adres e-mail jest już zajęty" -#: rhodecode/model/validators.py:671 +#: rhodecode/model/validators.py:685 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "e-mail \"%(email)s\" nie istnieje." -#: rhodecode/model/validators.py:708 +#: rhodecode/model/validators.py:722 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1356,21 +1507,25 @@ "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, " "który jest odpowiednikiem \"username\"" -#: rhodecode/model/validators.py:727 +#: rhodecode/model/validators.py:735 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "Rewizja %(revs)s jest już częścią nowej gałęzi więc określ jego status" -#: rhodecode/model/validators.py:759 +#: rhodecode/model/validators.py:767 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:760 +#: rhodecode/model/validators.py:768 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/templates/index.html:3 +#: rhodecode/model/validators.py:800 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "Repozytorium" @@ -1379,223 +1534,229 @@ #: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/bookmarks/bookmarks.html:9 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:9 -#: rhodecode/templates/journal/journal.html:49 -#: rhodecode/templates/journal/journal.html:50 -#: rhodecode/templates/tags/tags.html:10 +#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:47 +#: rhodecode/templates/tags/tags.html:9 msgid "quick filter..." msgstr "szybki filtr..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:239 msgid "repositories" msgstr "repozytoria" -#: rhodecode/templates/index_base.html:14 -#: rhodecode/templates/index_base.html:17 +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 #: rhodecode/templates/admin/repos/repos.html:21 msgid "Add repository" msgstr "Dodaj repozytorium" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/index_base.html:20 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 +#, fuzzy +msgid "Add group" +msgstr "edytuj grupy repo" + +#: rhodecode/templates/index_base.html:27 #, fuzzy msgid "Edit group" msgstr "edytuj grupy repo" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:36 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "Group name" msgstr "Nazwa grupy" -#: rhodecode/templates/index_base.html:37 -#: rhodecode/templates/index_base.html:79 +#: rhodecode/templates/index_base.html:41 +#: rhodecode/templates/index_base.html:83 #: rhodecode/templates/index_base.html:142 #: rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:270 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:73 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/forks/fork.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "Opis" -#: rhodecode/templates/index_base.html:47 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 -msgid "Repositories group" -msgstr "Grupy w repozytorium" - -#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:51 +#: rhodecode/templates/admin/permissions/permissions.html:55 +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 +#: rhodecode/templates/forks/fork.html:47 +msgid "Repository group" +msgstr "Repozytorium grupy" + +#: rhodecode/templates/index_base.html:82 #: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:271 -#: rhodecode/templates/admin/permissions/permissions.html:117 +#: rhodecode/templates/index_base.html:268 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:71 -#: rhodecode/templates/admin/users/user_edit.html:200 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:211 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 -#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/admin/users/user_edit_my_account.html:172 +#: rhodecode/templates/base/perms_summary.html:14 +#: rhodecode/templates/bookmarks/bookmarks.html:34 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:201 -#: rhodecode/templates/journal/journal.html:305 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:132 -#: rhodecode/templates/tags/tags.html:51 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/summary/summary.html:55 +#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/tags/tags.html:48 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "Nazwa" -#: rhodecode/templates/index_base.html:80 +#: rhodecode/templates/index_base.html:84 msgid "Last change" msgstr "Ostatnia aktywność" -#: rhodecode/templates/index_base.html:81 +#: rhodecode/templates/index_base.html:85 #: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:276 +#: rhodecode/templates/index_base.html:273 #: rhodecode/templates/admin/repos/repos.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:213 -#: rhodecode/templates/journal/journal.html:203 -#: rhodecode/templates/journal/journal.html:307 +#: rhodecode/templates/admin/users/user_edit_my_account.html:174 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:298 msgid "Tip" msgstr "Ostatnia zmiana" -#: rhodecode/templates/index_base.html:82 +#: rhodecode/templates/index_base.html:86 #: rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:278 +#: rhodecode/templates/index_base.html:275 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "Właściciel" -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "RSS" - -#: rhodecode/templates/index_base.html:84 +#: rhodecode/templates/index_base.html:87 msgid "Atom" msgstr "Atom" #: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:296 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:235 +#: rhodecode/templates/admin/users/user_edit_my_account.html:196 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:225 -#: rhodecode/templates/journal/journal.html:329 -#: rhodecode/templates/tags/tags.html:77 +#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/branches/branches.html:73 +#: rhodecode/templates/journal/journal.html:217 +#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "Kliknij, aby posortować rosnąco" #: rhodecode/templates/index_base.html:172 -#: rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:301 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:297 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:236 +#: rhodecode/templates/admin/users/user_edit_my_account.html:197 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:226 -#: rhodecode/templates/journal/journal.html:330 -#: rhodecode/templates/tags/tags.html:78 +#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/branches/branches.html:74 +#: rhodecode/templates/journal/journal.html:218 +#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "Kliknij, aby posortować malejąco" #: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:274 +#: rhodecode/templates/index_base.html:271 msgid "Last Change" msgstr "Ostatnia akytwność" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:302 +#: rhodecode/templates/index_base.html:211 #: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:237 +#: rhodecode/templates/admin/users/user_edit_my_account.html:198 #: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:227 -#: rhodecode/templates/journal/journal.html:331 -#: rhodecode/templates/tags/tags.html:79 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:219 +#: rhodecode/templates/journal/journal.html:322 +#: rhodecode/templates/tags/tags.html:76 msgid "No records found." msgstr "Nie znaleziono rekordów." -#: rhodecode/templates/index_base.html:214 -#: rhodecode/templates/index_base.html:303 +#: rhodecode/templates/index_base.html:212 +#: rhodecode/templates/index_base.html:299 #: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:238 +#: rhodecode/templates/admin/users/user_edit_my_account.html:199 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:228 -#: rhodecode/templates/journal/journal.html:332 -#: rhodecode/templates/tags/tags.html:80 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:220 +#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "Błąd danych." -#: rhodecode/templates/index_base.html:215 -#: rhodecode/templates/index_base.html:304 +#: rhodecode/templates/index_base.html:213 +#: rhodecode/templates/index_base.html:300 #: rhodecode/templates/admin/repos/repos.html:101 -#: rhodecode/templates/admin/users/user_edit_my_account.html:105 -#: rhodecode/templates/admin/users/user_edit_my_account.html:239 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +#: rhodecode/templates/admin/users/user_edit_my_account.html:200 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:229 -#: rhodecode/templates/journal/journal.html:333 -#: rhodecode/templates/tags/tags.html:81 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:221 +#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "Wczytywanie..." -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 -msgid "Sign In" +#: rhodecode/templates/index_base.html:298 +#, fuzzy +msgid "No repositories found." +msgstr "grupy w repozytorium" + +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +msgid "Log In" msgstr "Zaloguj się" #: rhodecode/templates/login.html:21 -msgid "Sign In to" -msgstr "Zarejestruj się" +#, python-format +msgid "Log In to %s" +msgstr "" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:54 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:89 -#: rhodecode/templates/summary/summary.html:131 +#: rhodecode/templates/admin/users/user_edit.html:57 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 +#: rhodecode/templates/admin/users/users.html:77 +#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "Nazwa użytkownika" #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:98 +#: rhodecode/templates/base/base.html:212 msgid "Password" msgstr "Hasło" @@ -1603,17 +1764,22 @@ msgid "Remember me" msgstr "Zapamiętaj mnie" +#: rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "Zaloguj się" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "Zapomniałeś hasła?" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 msgid "Don't have an account ?" msgstr "Nie masz konta?" #: rhodecode/templates/password_reset.html:5 -msgid "Reset your password" -msgstr "Zresetuj swoje hasło" +#, fuzzy +msgid "Password Reset" +msgstr "łącze resetowania hasła" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1645,23 +1811,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57 +#: rhodecode/templates/admin/users/user_edit.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "First Name" msgstr "Imię" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:103 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66 +#: rhodecode/templates/admin/users/user_edit.html:106 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 msgid "Last Name" msgstr "Nazwisko" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75 -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/admin/users/user_edit.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/summary/summary.html:125 msgid "Email" msgstr "E-mail" @@ -1673,44 +1839,31 @@ msgid "Your account must wait for activation by administrator" msgstr "Twoje konto musi zostać aktywowane przez administratora" -#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:76 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/summary/summary.html:77 msgid "Private repository" msgstr "Prywatne repozytorium" -#: rhodecode/templates/repo_switcher_list.html:16 +#: rhodecode/templates/repo_switcher_list.html:12 +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/summary/summary.html:79 msgid "Public repository" msgstr "Publiczne repozytorium" -#: rhodecode/templates/switch_to_list.html:3 -#: rhodecode/templates/branches/branches.html:14 -msgid "branches" -msgstr "gałęzie" - #: rhodecode/templates/switch_to_list.html:10 #: rhodecode/templates/branches/branches_data.html:57 msgid "There are no branches yet" msgstr "Nie ma jeszcze gałęzi" -#: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:15 -msgid "tags" -msgstr "Tagi" - #: rhodecode/templates/switch_to_list.html:22 #: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "Nie ma jeszcze tagów" -#: rhodecode/templates/switch_to_list.html:28 -#: rhodecode/templates/bookmarks/bookmarks.html:15 -msgid "bookmarks" -msgstr "zakładki" - #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 msgid "There are no bookmarks yet" @@ -1718,6 +1871,7 @@ #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/base/base.html:68 msgid "Admin journal" msgstr "Dziennik administratora" @@ -1741,9 +1895,12 @@ #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account.html:215 -#: rhodecode/templates/journal/journal.html:205 -#: rhodecode/templates/journal/journal.html:309 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:87 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:300 msgid "Action" msgstr "Działanie" @@ -1753,11 +1910,11 @@ msgstr "Repozytorium" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/tags/tags.html:52 +#: rhodecode/templates/tags/tags.html:49 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "Data" @@ -1776,6 +1933,7 @@ msgstr "Repozytoria domyślne" #: rhodecode/templates/admin/defaults/defaults.html:11 +#: rhodecode/templates/base/base.html:75 msgid "Defaults" msgstr "Domyślne" @@ -1788,8 +1946,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 +#: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1819,7 +1976,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 msgid "Enable locking" msgstr "Włącz blokowanie" @@ -1831,14 +1988,17 @@ #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 #: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:148 +#: rhodecode/templates/admin/repos/repo_edit.html:173 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:137 -#: rhodecode/templates/admin/users/user_edit.html:182 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users/user_edit.html:140 +#: rhodecode/templates/admin/users/user_edit.html:185 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "Zapisz" @@ -1847,8 +2007,11 @@ msgstr "Administracja LDAP" #: rhodecode/templates/admin/ldap/ldap.html:11 -msgid "Ldap" -msgstr "Ldap" +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:74 +#, fuzzy +msgid "LDAP" +msgstr "ldap" #: rhodecode/templates/admin/ldap/ldap.html:28 msgid "Connection settings" @@ -1928,8 +2091,7 @@ msgstr "Komentarze" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 msgid "Pull requests" msgstr "Połączone gałęzie" @@ -1947,6 +2109,7 @@ msgstr "Pokaż powiadomienia" #: rhodecode/templates/admin/notifications/show_notification.html:9 +#: rhodecode/templates/base/base.html:241 msgid "Notifications" msgstr "Powiadomienia" @@ -1955,11 +2118,12 @@ msgstr "Uprawnienia administracji" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63 -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:165 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/users/user_edit.html:150 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:86 +#: rhodecode/templates/base/base.html:73 msgid "Permissions" msgstr "Uprawnienia" @@ -1972,8 +2136,9 @@ msgstr "Dostęp anonimowy" #: rhodecode/templates/admin/permissions/permissions.html:49 +#, fuzzy msgid "" -"All default permissions on each repository will be reset to choosen " +"All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" @@ -1983,23 +2148,16 @@ #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -msgid "overwrite existing settings" +#, fuzzy +msgid "Overwrite existing settings" msgstr "Nadpisz ustawienia" -#: rhodecode/templates/admin/permissions/permissions.html:55 -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" -msgstr "Repozytorium grupy" - #: rhodecode/templates/admin/permissions/permissions.html:62 +#, fuzzy msgid "" -"All default permissions on each repository group will be reset to choosen" -" permission, note that all custom default permission on repositories " -"group will be lost" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" msgstr "" "Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. " "Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie " @@ -2018,22 +2176,23 @@ msgstr "Rozwidlanie repozytorium" #: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:209 -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:179 -#: rhodecode/templates/admin/settings/settings.html:269 -#: rhodecode/templates/admin/users/user_edit.html:138 -#: rhodecode/templates/admin/users/user_edit.html:183 -#: rhodecode/templates/admin/users/user_edit.html:286 -#: rhodecode/templates/admin/users/user_edit.html:334 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84 +#: rhodecode/templates/admin/permissions/permissions.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:149 +#: rhodecode/templates/admin/repos/repo_edit.html:174 +#: rhodecode/templates/admin/repos/repo_edit.html:388 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:278 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users/user_edit.html:283 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:95 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:110 msgid "Reset" msgstr "Zresetuj" @@ -2042,106 +2201,73 @@ msgid "Default User Permissions" msgstr "Domyślne uprawnienia" -#: rhodecode/templates/admin/permissions/permissions.html:111 -#: rhodecode/templates/admin/users/user_edit.html:194 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -msgid "Nothing here yet" -msgstr "Nic tu nie ma jeszcze" - -#: rhodecode/templates/admin/permissions/permissions.html:118 -#: rhodecode/templates/admin/users/user_edit.html:201 -#: rhodecode/templates/admin/users/user_edit_my_account.html:61 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 -msgid "Permission" -msgstr "Uprawnienia" - -#: rhodecode/templates/admin/permissions/permissions.html:119 -#: rhodecode/templates/admin/users/user_edit.html:202 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 -msgid "Edit Permission" -msgstr "Edycja Uprawnień" - -#: rhodecode/templates/admin/permissions/permissions.html:149 -#: rhodecode/templates/admin/permissions/permissions.html:151 -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:232 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:116 -#: rhodecode/templates/data_table/_dt_elements.html:117 -msgid "edit" -msgstr "edycja" - -#: rhodecode/templates/admin/permissions/permissions.html:168 -#: rhodecode/templates/admin/users/user_edit.html:295 +#: rhodecode/templates/admin/permissions/permissions.html:113 +#: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy msgid "Allowed IP addresses" msgstr "Adresy e-mail" -#: rhodecode/templates/admin/permissions/permissions.html:182 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 -#: rhodecode/templates/admin/users/user_edit.html:263 -#: rhodecode/templates/admin/users/user_edit.html:308 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/admin/permissions/permissions.html:127 +#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 +#: rhodecode/templates/admin/users/user_edit.html:212 +#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users_groups/users_groups.html:46 #: rhodecode/templates/data_table/_dt_elements.html:122 #: rhodecode/templates/data_table/_dt_elements.html:130 msgid "delete" msgstr "usuń" -#: rhodecode/templates/admin/permissions/permissions.html:183 -#: rhodecode/templates/admin/users/user_edit.html:309 +#: rhodecode/templates/admin/permissions/permissions.html:128 +#: rhodecode/templates/admin/users/user_edit.html:258 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "Potwierdź, aby usunąć ten e-mail: %s" -#: rhodecode/templates/admin/permissions/permissions.html:189 -#: rhodecode/templates/admin/users/user_edit.html:315 +#: rhodecode/templates/admin/permissions/permissions.html:134 +#: rhodecode/templates/admin/users/user_edit.html:264 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:200 -#: rhodecode/templates/admin/users/user_edit.html:326 +#: rhodecode/templates/admin/permissions/permissions.html:145 +#: rhodecode/templates/admin/users/user_edit.html:275 #, fuzzy msgid "New ip address" msgstr "Nowy adres e-mail" -#: rhodecode/templates/admin/permissions/permissions.html:208 -#: rhodecode/templates/admin/users/user_edit.html:285 -#: rhodecode/templates/admin/users/user_edit.html:333 +#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:387 +#: rhodecode/templates/admin/users/user_edit.html:234 +#: rhodecode/templates/admin/users/user_edit.html:282 msgid "Add" msgstr "Dodaj" -#: rhodecode/templates/admin/repos/repo_add.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -#: rhodecode/templates/base/base.html:154 +#: rhodecode/templates/admin/repos/repo_add.html:12 +#: rhodecode/templates/admin/repos/repo_add.html:16 +#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 +#: rhodecode/templates/base/base.html:263 msgid "Repositories" msgstr "Repozytoria" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +#: rhodecode/templates/admin/repos/repo_add.html:19 +#, fuzzy +msgid "Add new" msgstr "dodaj nowe" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:104 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Clone from" msgstr "Klonuj z" #: rhodecode/templates/admin/repos/repo_add_base.html:24 #: rhodecode/templates/admin/repos/repo_edit.html:44 -#: rhodecode/templates/settings/repo_settings.html:43 msgid "Optional http[s] url from which repository should be cloned." msgstr "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane." #: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/forks/fork.html:54 +#: rhodecode/templates/forks/fork.html:51 msgid "Optionaly select a group to put this repository into." msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." @@ -2151,44 +2277,39 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 -#: rhodecode/templates/forks/fork.html:41 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/forks/fork.html:38 msgid "Landing revision" msgstr "Docelowa rewizja" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 -#: rhodecode/templates/forks/fork.html:45 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 -#: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:70 +#: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -msgid "add" -msgstr "dodaj" - -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 -msgid "add new repository" -msgstr "dodaj nowe repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit.html:5 +#: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" msgstr "Edytuj repozytorium" +#: rhodecode/templates/admin/repos/repo_edit.html:12 +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:11 +#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/summary/summary.html:212 +msgid "Settings" +msgstr "Ustawienia" + #: rhodecode/templates/admin/repos/repo_edit.html:40 -#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "Klonowane uri" #: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 msgid "Optional select a group to put this repository into." msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." @@ -2196,55 +2317,56 @@ msgid "Change owner of this repository." msgstr "Zmiana właściciela tego repozytorium." -#: rhodecode/templates/admin/repos/repo_edit.html:152 -msgid "Administration" -msgstr "Administracja" - -#: rhodecode/templates/admin/repos/repo_edit.html:155 +#: rhodecode/templates/admin/repos/repo_edit.html:184 +#, fuzzy +msgid "Advanced settings" +msgstr "Zapisz ustawienia" + +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Statistics" msgstr "Statystyki" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Reset current statistics" msgstr "Zresetuj bieżące statystyki" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Confirm to remove current statistics" msgstr "Potwierdź usunięcie aktualnych statystyk" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "Ściągnięte do rev" -#: rhodecode/templates/admin/repos/repo_edit.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:195 msgid "Stats gathered" msgstr "statystyki zgromadzone" -#: rhodecode/templates/admin/repos/repo_edit.html:171 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Remote" msgstr "Zdalnie" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Pull changes from remote location" msgstr "Pobierz z zdalnej lokalizacji" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Confirm to pull changes from remote side" msgstr "Potwierdź pull z zdalnej strony" -#: rhodecode/templates/admin/repos/repo_edit.html:186 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "Cache" msgstr "Pamięć podręczna" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Invalidate repository cache" msgstr "Unieważnij pamięć podręczną repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Confirm to invalidate repository cache" msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:193 +#: rhodecode/templates/admin/repos/repo_edit.html:225 msgid "" "Manually invalidate cache for this repository. On first access repository" " will be cached again" @@ -2252,42 +2374,43 @@ "Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym " "dostępie do repozytorium zostanie dodany do bufora ponownie" -#: rhodecode/templates/admin/repos/repo_edit.html:198 +#: rhodecode/templates/admin/repos/repo_edit.html:230 msgid "List of cached values" msgstr "Lista buforowanych wartości" -#: rhodecode/templates/admin/repos/repo_edit.html:201 +#: rhodecode/templates/admin/repos/repo_edit.html:233 msgid "Prefix" msgstr "Prefiks" -#: rhodecode/templates/admin/repos/repo_edit.html:202 +#: rhodecode/templates/admin/repos/repo_edit.html:234 msgid "Key" msgstr "Klucz" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:235 #: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:121 +#: rhodecode/templates/admin/users/user_edit.html:124 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_group_add.html:41 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +#: rhodecode/templates/admin/users_groups/users_groups.html:36 msgid "Active" msgstr "Aktywny" -#: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:306 -#: rhodecode/templates/base/base.html:308 -#: rhodecode/templates/base/base.html:310 +#: rhodecode/templates/admin/repos/repo_edit.html:250 +#: rhodecode/templates/base/base.html:280 +#: rhodecode/templates/base/base.html:281 msgid "Public journal" msgstr "Dziennik publiczny" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "Remove from public journal" msgstr "Usuń z dziennika publicznego" -#: rhodecode/templates/admin/repos/repo_edit.html:226 +#: rhodecode/templates/admin/repos/repo_edit.html:258 msgid "Add to public journal" msgstr "Dodaj do dziennika publicznego" -#: rhodecode/templates/admin/repos/repo_edit.html:231 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" @@ -2295,74 +2418,121 @@ "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla " "wszystkich w dzienniku publicznym" -#: rhodecode/templates/admin/repos/repo_edit.html:238 +#: rhodecode/templates/admin/repos/repo_edit.html:270 msgid "Locking" msgstr "Blokuj" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Unlock locked repo" msgstr "Odblokuj zablokowane repo" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Confirm to unlock repository" msgstr "Potwierdź odblokowanie repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "lock repo" msgstr "blokada repo" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to lock repository" msgstr "Potwierdź blokowanie repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:247 +#: rhodecode/templates/admin/repos/repo_edit.html:279 msgid "Repository is not locked" msgstr "Repozytorium nie jest zablokowane" -#: rhodecode/templates/admin/repos/repo_edit.html:252 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" "Wymuś blokowanie na repozytorium. Działa tylko wtedy, gdy dostęp " "anonimowy jest wyłączony" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:291 msgid "Set as fork of" msgstr "Ustaw jako rozwidlenie" -#: rhodecode/templates/admin/repos/repo_edit.html:264 +#: rhodecode/templates/admin/repos/repo_edit.html:296 msgid "set" msgstr "ustaw" -#: rhodecode/templates/admin/repos/repo_edit.html:268 +#: rhodecode/templates/admin/repos/repo_edit.html:300 msgid "Manually set this repository as a fork of another from the list" msgstr "Ręczne ustawienie rozwidlenia z listy" -#: rhodecode/templates/admin/repos/repo_edit.html:274 +#: rhodecode/templates/admin/repos/repo_edit.html:306 #: rhodecode/templates/changeset/changeset_file_comment.html:41 msgid "Delete" msgstr "Usuń" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Remove this repository" msgstr "Usuń to repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Confirm to delete this repository" msgstr "Potwierdź, aby usunąć repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:282 -#: rhodecode/templates/settings/repo_settings.html:119 +#: rhodecode/templates/admin/repos/repo_edit.html:317 +#, fuzzy, python-format +msgid "this repository has %s fork" +msgid_plural "this repository has %s forks" +msgstr[0] "to repozytorium ma %s fork" +msgstr[1] "to repozytorium ma %s forki" +msgstr[2] "to repozytorium ma %s forków" + +#: rhodecode/templates/admin/repos/repo_edit.html:318 +#, fuzzy +msgid "Detach forks" +msgstr "Ustaw jako rozwidlenie" + +#: rhodecode/templates/admin/repos/repo_edit.html:319 +#, fuzzy +msgid "Delete forks" +msgstr "usuń" + +#: rhodecode/templates/admin/repos/repo_edit.html:322 +#, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need fully delete it " -"from file system please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" +" from file system please do it manually" msgstr "" "To repozytorium zostanie zmienione w sposób szczególny, żeby było " "niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go " "z systemu plików prosimy zrobić to ręcznie" +#: rhodecode/templates/admin/repos/repo_edit.html:336 +msgid "Extra fields" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:348 +#, fuzzy, python-format +msgid "Confirm to delete this field: %s" +msgstr "Potwierdź, aby usunąć ten e-mail: %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:362 +#, fuzzy +msgid "New field key" +msgstr "dodaj nowy plik" + +#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgid "New field label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:373 +msgid "Enter short label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:379 +#, fuzzy +msgid "New field description" +msgstr "opis" + +#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgid "Enter description of a field" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -2380,8 +2550,6 @@ #: 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:85 -#: rhodecode/templates/base/base.html:235 msgid "admin" msgstr "administracja" @@ -2391,49 +2559,49 @@ msgstr "użytkownik" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 -#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "prywatne repozytorium" #: rhodecode/templates/admin/repos/repo_edit_perms.html:19 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 msgid "default" msgstr "domyślne" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 msgid "revoke" msgstr "odwołane" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 msgid "Add another member" msgstr "Dodaj kolejnego użytkownika" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 msgid "Failed to remove user" msgstr "Nie udało się usunąć użytkownika" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 -msgid "Failed to remove users group" +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 +#, fuzzy +msgid "Failed to remove user group" msgstr "Nie udało się usunąć grupy użytkowników" #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "Administracja repozytoriami" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 #, fuzzy msgid "apply to children" msgstr "dotyczy dzieci" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 #, fuzzy msgid "" "Set or revoke permission to all children of that group, including non-" @@ -2442,27 +2610,12 @@ "Ustawia lub cofa uprawnienia do wszystkich dzieci z tej grupy, w tym " "repozytoria oraz innych grup" +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#, python-format +msgid "%s Group Dashboard" +msgstr "%s Grupa" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 -#: rhodecode/templates/base/base.html:128 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 msgid "Home" msgstr "Strona Główna" @@ -2471,45 +2624,48 @@ msgstr "używając" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repos group" -msgstr "Dodaj grupę repos" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 -msgid "Repos groups" -msgstr "Grupy repos" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 -msgid "add new repos group" +#, fuzzy +msgid "Add repository group" +msgstr "Repozytorium grupy" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 +#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 +#, fuzzy +msgid "Repository groups" +msgstr "Repozytorium grupy" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 +#, fuzzy +msgid "Add new repository group" msgstr "dodaj nową grupę repozytorium" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 msgid "Group parent" -msgstr "Dominująca grupa" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/users/user_add.html:94 -#: rhodecode/templates/admin/users_groups/users_group_add.html:49 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:149 +msgstr "Rodzic gropy" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59 msgid "save" msgstr "zapisz" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repos group" -msgstr "Edytuj grupy repo" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 -msgid "edit repos group" +#, fuzzy +msgid "Edit repository group" msgstr "edytuj grupy repo" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 +#, fuzzy, python-format +msgid "Edit repository group %s" +msgstr "edytuj grupe %s" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 #, fuzzy -msgid "Add new child group" +msgid "Add child group" msgstr "dodaj nową grupę użytkowników" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -2518,25 +2674,29 @@ "wszystkich innych grup i repozytoriów wewnątrz" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repositories groups administration" +#, fuzzy +msgid "Repository groups administration" msgstr "Repozytoria grup administracyjnych" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -#, fuzzy -msgid "Add new group" -msgstr "dodaj nową grupę użytkowników" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" msgstr "Liczba najwyższego poziomu repozytorium" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "działanie" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#, fuzzy +msgid "Edit" +msgstr "edycja" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/base/perms_summary.html:29 +#: rhodecode/templates/base/perms_summary.html:48 +#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/data_table/_dt_elements.html:116 +#: rhodecode/templates/data_table/_dt_elements.html:117 +msgid "edit" +msgstr "edycja" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -2544,8 +2704,9 @@ msgstr[1] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami" msgstr[2] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68 -msgid "There are no repositories groups yet" +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 +#, fuzzy +msgid "There are no repository groups yet" msgstr "Nie ma jeszcze grup repozytoriów" #: rhodecode/templates/admin/settings/hooks.html:5 @@ -2553,12 +2714,6 @@ msgid "Settings administration" msgstr "Ustawienia administracji" -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:13 -msgid "Settings" -msgstr "Ustawienia" - #: rhodecode/templates/admin/settings/hooks.html:24 msgid "Built in hooks - read only" msgstr "Wbudowana w aktualizację - tylko do odczytu" @@ -2575,15 +2730,16 @@ msgid "Failed to remove hook" msgstr "Nie udało się usunąć hooka" -#: rhodecode/templates/admin/settings/settings.html:24 +#: rhodecode/templates/admin/settings/settings.html:26 msgid "Remap and rescan repositories" msgstr "Mapowanie i skanowanie repozytorów" -#: rhodecode/templates/admin/settings/settings.html:32 -msgid "rescan option" +#: rhodecode/templates/admin/settings/settings.html:34 +#, fuzzy +msgid "Rescan option" msgstr "ponowne skanowanie opcji" -#: rhodecode/templates/admin/settings/settings.html:38 +#: rhodecode/templates/admin/settings/settings.html:40 msgid "" "In case a repository was deleted from filesystem and there are leftovers " "in the database check this option to scan obsolete data in database and " @@ -2593,11 +2749,12 @@ "pozostałości w bazie danych to ta opcja sprawdzi ją oraz przeskanuje, a " "następnie usunie je z bazy danych." -#: rhodecode/templates/admin/settings/settings.html:39 -msgid "destroy old data" +#: rhodecode/templates/admin/settings/settings.html:41 +#, fuzzy +msgid "Destroy old data" msgstr "zniszcz stare dane" -#: rhodecode/templates/admin/settings/settings.html:41 +#: rhodecode/templates/admin/settings/settings.html:43 msgid "" "Rescan repositories location for new repositories. Also deletes obsolete " "if `destroy` flag is checked " @@ -2605,93 +2762,101 @@ "Skanowanie ponowne lokalizacji dla nowych repozytoriów. Usuwa również " "nieaktualne jeśli została zaznaczona flaga `zniszcz` do sprawdzana" -#: rhodecode/templates/admin/settings/settings.html:46 +#: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" msgstr "Skanuj ponownie repozytoria" -#: rhodecode/templates/admin/settings/settings.html:52 +#: rhodecode/templates/admin/settings/settings.html:54 msgid "Whoosh indexing" msgstr "indeksowanie Whoosh" -#: rhodecode/templates/admin/settings/settings.html:60 -msgid "index build option" +#: rhodecode/templates/admin/settings/settings.html:62 +#, fuzzy +msgid "Index build option" msgstr "opcja budowania indeksowania" -#: rhodecode/templates/admin/settings/settings.html:65 -msgid "build from scratch" +#: rhodecode/templates/admin/settings/settings.html:67 +#, fuzzy +msgid "Build from scratch" msgstr "buduj od podstaw" -#: rhodecode/templates/admin/settings/settings.html:71 +#: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" msgstr "Indeksuj ponownie" -#: rhodecode/templates/admin/settings/settings.html:77 +#: rhodecode/templates/admin/settings/settings.html:79 msgid "Global application settings" msgstr "Globalne ustawienia aplikacji" -#: rhodecode/templates/admin/settings/settings.html:86 -msgid "Application name" -msgstr "Nazwa aplikacji" - -#: rhodecode/templates/admin/settings/settings.html:95 -msgid "Realm text" -msgstr "Realny tekst" - -#: rhodecode/templates/admin/settings/settings.html:104 -msgid "GA code" -msgstr "GA kod" - -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/settings/settings.html:268 +#: rhodecode/templates/admin/settings/settings.html:88 +msgid "Site branding" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:97 +msgid "HTTP authentication realm" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:106 +msgid "Google Analytics code" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:114 +#: rhodecode/templates/admin/settings/settings.html:186 +#: rhodecode/templates/admin/settings/settings.html:277 msgid "Save settings" msgstr "Zapisz ustawienia" -#: rhodecode/templates/admin/settings/settings.html:119 +#: rhodecode/templates/admin/settings/settings.html:121 msgid "Visualisation settings" msgstr "Ustawienia wizualizacji" -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:129 msgid "General" msgstr "Główne" -#: rhodecode/templates/admin/settings/settings.html:132 +#: rhodecode/templates/admin/settings/settings.html:134 msgid "Use lightweight dashboard" msgstr "Użyj lekkiego pulpitu" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:140 +#, fuzzy +msgid "Use repository extra fields" +msgstr "repozytoria" + +#: rhodecode/templates/admin/settings/settings.html:147 msgid "Icons" msgstr "Ikony" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Show public repo icon on repositories" msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:156 msgid "Show private repo icon on repositories" msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:163 msgid "Meta-Tagging" msgstr "Tagowanie meta" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:168 msgid "Stylify recognised metatags:" msgstr "Stylizacja rozpoznanych meta tagów:" -#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:195 msgid "VCS settings" msgstr "VCS ustawienia" -#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "Web" msgstr "www" -#: rhodecode/templates/admin/settings/settings.html:201 -msgid "require ssl for vcs operations" +#: rhodecode/templates/admin/settings/settings.html:209 +#, fuzzy +msgid "Require SSL for vcs operations" msgstr "wymagaj ssl dla operacji vcs" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" @@ -2699,55 +2864,59 @@ "RhodeCode wymaga SSL do wysłania zmian lub pobierania. Jeśli brakuje SSL " "zwróci błąd HTTP 406: Not Acceptable" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:217 msgid "Hooks" msgstr "Aktualizacja" -#: rhodecode/templates/admin/settings/settings.html:214 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Update repository after push (hg update)" msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)" -#: rhodecode/templates/admin/settings/settings.html:218 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Show repository size after push" msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian" -#: rhodecode/templates/admin/settings/settings.html:222 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "Log user push commands" msgstr "Logi poleceń wysłania zmian użytkowników" -#: rhodecode/templates/admin/settings/settings.html:226 +#: rhodecode/templates/admin/settings/settings.html:234 msgid "Log user pull commands" msgstr "Logi poleceń połączenia gałęzi użytkowników" -#: rhodecode/templates/admin/settings/settings.html:230 -msgid "advanced setup" +#: rhodecode/templates/admin/settings/settings.html:238 +#, fuzzy +msgid "Advanced setup" msgstr "zaawansowane ustawienia" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Mercurial Extensions" msgstr "Rozszerzenia Mercurial" -#: rhodecode/templates/admin/settings/settings.html:240 -msgid "largefiles extensions" +#: rhodecode/templates/admin/settings/settings.html:248 +#, fuzzy +msgid "Enable largefiles extension" msgstr "rozszerzenia dużych pliów" -#: rhodecode/templates/admin/settings/settings.html:244 -msgid "hgsubversion extensions" +#: rhodecode/templates/admin/settings/settings.html:252 +#, fuzzy +msgid "Enable hgsubversion extension" msgstr "rozszerzenia hgsubversion" -#: rhodecode/templates/admin/settings/settings.html:246 +#: rhodecode/templates/admin/settings/settings.html:254 +#, fuzzy msgid "" -"Requires hgsubversion library installed. Allows clonning from svn remote " +"Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" "Wymaga biblioteki hgsubversion zainstalowanej. Umożliwia klonowanie z " "zdalnych lokalizacji svn" -#: rhodecode/templates/admin/settings/settings.html:256 +#: rhodecode/templates/admin/settings/settings.html:264 msgid "Repositories location" msgstr "Położenie repozytorium" -#: rhodecode/templates/admin/settings/settings.html:261 +#: rhodecode/templates/admin/settings/settings.html:269 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " @@ -2757,12 +2926,13 @@ "zmienić, należy ponownie uruchomić aplikację w celu zaktualizowania " "lokalizacji. Kliknij tą etykietę, żeby odblokować." -#: rhodecode/templates/admin/settings/settings.html:262 -#: rhodecode/templates/base/base.html:227 -msgid "unlock" +#: rhodecode/templates/admin/settings/settings.html:270 +#: rhodecode/templates/base/base.html:131 +#, fuzzy +msgid "Unlock" msgstr "odblokowany" -#: rhodecode/templates/admin/settings/settings.html:263 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" @@ -2770,25 +2940,26 @@ "Miejsce, w którym przechowywane są repozytoria. Po zmianie tej wartości " "jest wymagany restart i ponowne skanowanie" -#: rhodecode/templates/admin/settings/settings.html:283 +#: rhodecode/templates/admin/settings/settings.html:292 msgid "Test Email" msgstr "Test e-maila" -#: rhodecode/templates/admin/settings/settings.html:291 +#: rhodecode/templates/admin/settings/settings.html:300 msgid "Email to" msgstr "E-mail do" -#: rhodecode/templates/admin/settings/settings.html:299 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "Send" msgstr "Wyślij" -#: rhodecode/templates/admin/settings/settings.html:305 +#: rhodecode/templates/admin/settings/settings.html:314 msgid "System Info and Packages" msgstr "Informacje Systemowe i pakiety" -#: rhodecode/templates/admin/settings/settings.html:308 -msgid "show" -msgstr "pokaż" +#: rhodecode/templates/admin/settings/settings.html:317 +#: rhodecode/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "Wyświetl" #: rhodecode/templates/admin/users/user_add.html:5 msgid "Add user" @@ -2796,11 +2967,14 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 +#: rhodecode/templates/base/base.html:71 msgid "Users" msgstr "Użytkownicy" #: rhodecode/templates/admin/users/user_add.html:12 -msgid "add new user" +#: rhodecode/templates/admin/users/users.html:23 +#, fuzzy +msgid "Add new user" msgstr "dodaj nowego użytkownika" #: rhodecode/templates/admin/users/user_add.html:50 @@ -2811,6 +2985,12 @@ msgid "Edit user" msgstr "Edytuj użytkownika" +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#, fuzzy, python-format +msgid "Edit %s" +msgstr "edycja %s" + #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 msgid "Change your avatar at" @@ -2826,30 +3006,31 @@ msgid "API key" msgstr "Klucz API" -#: rhodecode/templates/admin/users/user_edit.html:48 -msgid "Your IP" +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 +msgid "Current IP" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:67 +#: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" msgstr "LDAP DN" -#: rhodecode/templates/admin/users/user_edit.html:76 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39 +#: rhodecode/templates/admin/users/user_edit.html:79 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password" msgstr "Nowe hasło" -#: rhodecode/templates/admin/users/user_edit.html:85 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48 +#: rhodecode/templates/admin/users/user_edit.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "New password confirmation" msgstr "Potwierdzenie nowego hasła" -#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:158 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "Dziedziczą uprawnienia domyślne" -#: rhodecode/templates/admin/users/user_edit.html:160 +#: rhodecode/templates/admin/users/user_edit.html:163 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2859,31 +3040,31 @@ "Zaznacz, żeby dziedziczyć uprawnienia z %s ustawień. Po wybraniu tej " "opcji, poniżej nie ma żadnych działań" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:169 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "Utwórz repozytorium" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:177 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "Rozwidlenie repozytorium" -#: rhodecode/templates/admin/users/user_edit.html:251 +#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "Adresy e-mail" -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/users/user_edit.html:213 #, python-format msgid "Confirm to delete this email: %s" msgstr "Potwierdź, aby usunąć ten e-mail: %s" -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "New email address" msgstr "Nowy adres e-mail" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:130 +#: rhodecode/templates/base/base.html:242 msgid "My account" msgstr "Moje konto" @@ -2896,7 +3077,7 @@ msgstr "Moje uprawnienia" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:57 +#: rhodecode/templates/journal/journal.html:54 msgid "My repos" msgstr "Moje repo" @@ -2904,30 +3085,44 @@ msgid "My pull requests" msgstr "Moje prośby połączenia gałęzi" -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/journal/journal.html:61 -msgid "Add repo" -msgstr "Dodaj repo" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 +#, fuzzy +msgid "Show closed pull requests" +msgstr "[zamknięty] wniosek o połączenie gałęzi" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" msgstr "Otwarty przez mnie" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 #, python-format msgid "Pull request #%s opened on %s" msgstr "Wniosek połączenia gałęzi #%s otwarty %s" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 +#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_show.html:27 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +msgid "Closed" +msgstr "Zamknięte" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 msgid "Confirm to delete this pull request" msgstr "Potwierdź usunięcie połączenia gałęzi" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 +msgid "Nothing here yet" +msgstr "Nic tu nie ma jeszcze" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" msgstr "Biorę udział w" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "Wniosek połączenia gałęzi #%s otwarty %s dnia %s" @@ -2937,68 +3132,60 @@ msgstr "Administracja użytkownikami" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:241 msgid "users" msgstr "użytkownicy" -#: rhodecode/templates/admin/users/users.html:23 +#: rhodecode/templates/admin/users/users.html:80 #, fuzzy -msgid "Add new user" -msgstr "dodaj nowego użytkownika" - -#: rhodecode/templates/admin/users/users.html:77 -msgid "username" -msgstr "nazwa użytkownika" - -#: rhodecode/templates/admin/users/users.html:80 -msgid "firstname" +msgid "Firstname" msgstr "imię" #: rhodecode/templates/admin/users/users.html:81 -msgid "lastname" +#, fuzzy +msgid "Lastname" msgstr "nazwisko" #: rhodecode/templates/admin/users/users.html:82 -msgid "last login" +#, fuzzy +msgid "Last login" msgstr "ostatnio zalogowany" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" -msgstr "aktywny" - -#: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:244 -msgid "ldap" -msgstr "ldap" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -msgid "Add users group" +#, fuzzy +msgid "Add user group" msgstr "Dodaj grupę użytkowników" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -msgid "Users groups" -msgstr "Grupy użytkowników" +#: rhodecode/templates/admin/users_groups/users_groups.html:11 +#: rhodecode/templates/base/base.html:72 +#, fuzzy +msgid "User groups" +msgstr "grupy użytkowników" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -msgid "add new users group" +#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#, fuzzy +msgid "Add new user group" msgstr "dodaj nową grupę użytkowników" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit users group" +#, fuzzy +msgid "Edit user group" msgstr "Edytuj grupę użytkowników" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -msgid "UsersGroups" -msgstr "Grupy użytkowników" +#, fuzzy +msgid "UserGroups" +msgstr "grupy użytkowników" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "Members" msgstr "Użytkownik" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -msgid "Choosen group members" +#, fuzzy +msgid "Chosen group members" msgstr "Wybrane grupy użytkowników" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 @@ -3013,264 +3200,264 @@ msgid "Add all elements" msgstr "Dodaj wszystkie elementy" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 msgid "Group members" msgstr "Grupy użytkowników" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 msgid "No members yet" msgstr "Nie ma jeszcze żadnego użytkownika" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 -msgid "Permissions defined for this group" -msgstr "Uprawnienia określone dla tej grupy" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 -msgid "No permissions set yet" -msgstr "Nie ma jeszcze ustawionych uprawnień" - #: rhodecode/templates/admin/users_groups/users_groups.html:5 -msgid "Users groups administration" +#, fuzzy +msgid "User groups administration" msgstr "Użytkownicy grupy administracji" -#: rhodecode/templates/admin/users_groups/users_groups.html:23 -#, fuzzy -msgid "Add new user group" -msgstr "dodaj nową grupę użytkowników" - -#: rhodecode/templates/admin/users_groups/users_groups.html:32 -msgid "group name" -msgstr "nazwa grupy" - -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -#: rhodecode/templates/base/root.html:46 -msgid "members" -msgstr "użytkownik" - -#: rhodecode/templates/admin/users_groups/users_groups.html:45 -#, python-format -msgid "Confirm to delete this users group: %s" +#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#, fuzzy, python-format +msgid "Confirm to delete this user group: %s" msgstr "Potwierdź usunięcie grupy użytkowników: %s" -#: rhodecode/templates/base/base.html:41 +#: rhodecode/templates/base/base.html:42 msgid "Submit a bug" msgstr "Prześlij błąd" -#: rhodecode/templates/base/base.html:76 -#, fuzzy -msgid "Not logged in" -msgstr "ostatnio zalogowany" - -#: rhodecode/templates/base/base.html:83 -msgid "Login to your account" -msgstr "Zaloguj się do swojego konta" - -#: rhodecode/templates/base/base.html:106 -msgid "Forgot password ?" -msgstr "Nie pamiętasz hasła?" - -#: rhodecode/templates/base/base.html:113 -msgid "Log In" -msgstr "Zaloguj się" - -#: rhodecode/templates/base/base.html:124 -msgid "Inbox" -msgstr "Odebrana poczta" - -#: rhodecode/templates/base/base.html:129 -#: rhodecode/templates/base/base.html:297 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:301 -#: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/public_journal.html:4 -msgid "Journal" -msgstr "Dziennik" - -#: rhodecode/templates/base/base.html:131 -msgid "Log Out" -msgstr "Wyloguj się" - -#: rhodecode/templates/base/base.html:150 -msgid "Switch repository" -msgstr "Przełącz repozytorium" - -#: rhodecode/templates/base/base.html:152 -msgid "Products" -msgstr "Produkty" - -#: rhodecode/templates/base/base.html:158 -#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47 -msgid "loading..." -msgstr "wczytywanie..." - -#: rhodecode/templates/base/base.html:166 -#: rhodecode/templates/base/base.html:168 -#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/base/base.html:108 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 +#: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "Podsumowanie" -#: rhodecode/templates/base/base.html:174 -#: rhodecode/templates/base/base.html:176 -#: rhodecode/templates/base/base.html:178 -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/base/base.html:109 +#: rhodecode/templates/changelog/changelog.html:11 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "Dziennik zmian" -#: rhodecode/templates/base/base.html:182 -#: rhodecode/templates/base/base.html:184 -#: rhodecode/templates/base/base.html:186 -msgid "Switch to" -msgstr "Przełącz do" - -#: rhodecode/templates/base/base.html:193 -#: rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:110 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:12 msgid "Files" msgstr "Pliki" -#: rhodecode/templates/base/base.html:201 -#: rhodecode/templates/base/base.html:205 +#: rhodecode/templates/base/base.html:112 +#, fuzzy +msgid "Switch To" +msgstr "Przełącz do" + +#: rhodecode/templates/base/base.html:114 +#: rhodecode/templates/base/base.html:267 +msgid "loading..." +msgstr "wczytywanie..." + +#: rhodecode/templates/base/base.html:118 msgid "Options" msgstr "Opcje" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/base/base.html:212 -msgid "repository settings" -msgstr "ustawienia repozytorium" - -#: rhodecode/templates/base/base.html:216 -#: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/forks/fork.html:13 -msgid "fork" -msgstr "gałąż" - -#: rhodecode/templates/base/base.html:218 -#: rhodecode/templates/changelog/changelog.html:43 +#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "Porównaj rozwidlenie" + +#: rhodecode/templates/base/base.html:126 #, fuzzy -msgid "open new pull request" -msgstr "Otwórz nową prośbę o połączenie gałęzi" - -#: rhodecode/templates/base/base.html:221 +msgid "Lightweight changelog" +msgstr "Użyj lekkiego pulpitu" + +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:54 +msgid "Search" +msgstr "Szukaj" + +#: rhodecode/templates/base/base.html:133 +#, fuzzy +msgid "Lock" +msgstr "zablokowane" + +#: rhodecode/templates/base/base.html:141 +#, fuzzy +msgid "Follow" +msgstr "obserwatorzy" + +#: rhodecode/templates/base/base.html:142 #, fuzzy -msgid "compare fork" -msgstr "Porównaj rozwidlenie" - -#: rhodecode/templates/base/base.html:223 -msgid "search" -msgstr "szukaj" - -#: rhodecode/templates/base/base.html:229 -msgid "lock" -msgstr "zablokowane" - -#: rhodecode/templates/base/base.html:240 -msgid "repositories groups" -msgstr "grupy w repozytorium" - -#: rhodecode/templates/base/base.html:242 -msgid "users groups" -msgstr "grupy użytkowników" +msgid "Unfollow" +msgstr "obserwatorzy" + +#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/forks/fork.html:9 +msgid "Fork" +msgstr "Gałąź" + +#: rhodecode/templates/base/base.html:147 +#, fuzzy +msgid "Create Pull Request" +msgstr "Stwórz nowe żądanie połączenia gałęzi" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Show Pull Requests" +msgstr "Nowa prośba o połączenie gałęzi" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Pull Requests" +msgstr "Połączone gałęzie" + +#: rhodecode/templates/base/base.html:190 +#, fuzzy +msgid "Not logged in" +msgstr "ostatnio zalogowany" + +#: rhodecode/templates/base/base.html:197 +msgid "Login to your account" +msgstr "Zaloguj się do swojego konta" + +#: rhodecode/templates/base/base.html:220 +msgid "Forgot password ?" +msgstr "Nie pamiętasz hasła?" #: rhodecode/templates/base/base.html:243 -msgid "permissions" -msgstr "uprawnienia" - -#: rhodecode/templates/base/base.html:245 -msgid "defaults" -msgstr "domyślne" - -#: rhodecode/templates/base/base.html:246 -msgid "settings" -msgstr "ustawienia" - -#: rhodecode/templates/base/base.html:256 -#: rhodecode/templates/base/base.html:258 -msgid "Followers" -msgstr "Obserwowane" - -#: rhodecode/templates/base/base.html:264 -#: rhodecode/templates/base/base.html:266 -msgid "Forks" -msgstr "Gałęzie" - -#: rhodecode/templates/base/base.html:315 -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 -#: rhodecode/templates/search/search.html:52 -msgid "Search" -msgstr "Szukaj" - -#: rhodecode/templates/base/root.html:42 -msgid "add another comment" -msgstr "dodaj kolejny komentarz" +msgid "Log Out" +msgstr "Wyloguj się" + +#: rhodecode/templates/base/base.html:262 +msgid "Switch repository" +msgstr "Przełącz repozytorium" + +#: rhodecode/templates/base/base.html:274 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "Dziennik" + +#: rhodecode/templates/base/base.html:286 +#, fuzzy +msgid "Search in repositories" +msgstr "Szukaj we wszystkich repozytoriach" + +#: rhodecode/templates/base/perms_summary.html:8 +#, fuzzy +msgid "No permissions defined yet" +msgstr "Nie ma jeszcze ustawionych uprawnień" + +#: rhodecode/templates/base/perms_summary.html:15 +msgid "Permission" +msgstr "Uprawnienia" + +#: rhodecode/templates/base/perms_summary.html:16 +msgid "Edit Permission" +msgstr "Edycja Uprawnień" #: rhodecode/templates/base/root.html:43 +#, fuzzy +msgid "Add another comment" +msgstr "dodaj kolejny komentarz" + +#: rhodecode/templates/base/root.html:44 #: rhodecode/templates/data_table/_dt_elements.html:140 -#: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" -#: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:61 +#: rhodecode/templates/base/root.html:45 msgid "Start following this repository" msgstr "Zacznij obserwację tego repozytorium" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Group" msgstr "Grupa" +#: rhodecode/templates/base/root.html:47 +msgid "members" +msgstr "użytkownik" + #: rhodecode/templates/base/root.html:48 -msgid "search truncated" -msgstr "wyszukaj obcięte" +#: rhodecode/templates/pullrequests/pullrequest.html:181 +#, fuzzy +msgid "Loading ..." +msgstr "wczytywanie..." #: rhodecode/templates/base/root.html:49 -msgid "no matching files" -msgstr "nie ma plików pasujących" +#, fuzzy +msgid "Search truncated" +msgstr "wyszukaj obcięte" #: rhodecode/templates/base/root.html:50 -msgid "Open new pull request" -msgstr "Otwórz nową prośbę o połączenie gałęzi" +#, fuzzy +msgid "No matching files" +msgstr "nie ma plików pasujących" #: rhodecode/templates/base/root.html:51 -msgid "Open new pull request for selected changesets" -msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian" +#: rhodecode/templates/changelog/changelog.html:36 +msgid "Open new pull request" +msgstr "Otwórz nową prośbę o połączenie gałęzi" #: rhodecode/templates/base/root.html:52 -msgid "Show selected changes __S -> __E" -msgstr "Pokaż wybrane zmiany __S -> __E" +msgid "Open new pull request for selected changesets" +msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian" #: rhodecode/templates/base/root.html:53 +#, fuzzy +msgid "Show selected changesets __S -> __E" +msgstr "Pokaż wybrane zmiany __S -> __E" + +#: rhodecode/templates/base/root.html:54 +#, fuzzy +msgid "Show selected changeset __S" +msgstr "Pokaż wybrane zmiany __S -> __E" + +#: rhodecode/templates/base/root.html:55 msgid "Selection link" msgstr "Wybór linku" +#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/changeset/diff_block.html:8 +#, fuzzy +msgid "Collapse diff" +msgstr "Pliki różnic" + +#: rhodecode/templates/base/root.html:57 +#, fuzzy +msgid "Expand diff" +msgstr "poprawka różnic" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "%s Zakładki" -#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "Autor" -#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks.html:38 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/tags/tags.html:55 +#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "Rewizja" @@ -3280,15 +3467,13 @@ msgid "%s Branches" msgstr "%s Gałęzie" -#: rhodecode/templates/branches/branches.html:29 +#: rhodecode/templates/branches/branches.html:26 msgid "Compare branches" msgstr "porównaj gałęzie" -#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches.html:53 #: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/compare/compare_diff.html:5 -#: rhodecode/templates/compare/compare_diff.html:13 -#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "Porównaj" @@ -3298,7 +3483,7 @@ msgid "%s Changelog" msgstr "%s Dziennik zmian" -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/changelog/changelog.html:11 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -3306,109 +3491,76 @@ msgstr[1] "pokazano %d w rewizjach %d" msgstr[2] "pokazano %d w rewizjach %d" -#: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/changelog/changelog.html:30 msgid "Clear selection" msgstr "Wyczyść zaznaczenie" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 #: rhodecode/templates/forks/forks_data.html:19 -#, python-format -msgid "compare fork with %s" +#, fuzzy, python-format +msgid "Compare fork with %s" msgstr "porównaj gałęzie %s" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 msgid "Compare fork with parent" msgstr "porównaj gałąź w rodzicem" -#: rhodecode/templates/changelog/changelog.html:49 -msgid "Show" -msgstr "Wyświetl" - -#: rhodecode/templates/changelog/changelog.html:74 -#: rhodecode/templates/summary/summary.html:375 -msgid "show more" -msgstr "pokaż więcej" - -#: rhodecode/templates/changelog/changelog.html:78 -msgid "Affected number of files, click to show more details" -msgstr "Dotyczy liczby plików, kliknij, aby zobaczyć więcej szczegółów" - -#: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:65 -#: rhodecode/templates/changeset/changeset_file_comment.html:20 -#: rhodecode/templates/changeset/changeset_range.html:46 -msgid "Changeset status" -msgstr "Status grupy zmian" - -#: rhodecode/templates/changelog/changelog.html:94 -#: rhodecode/templates/shortlog/shortlog_data.html:20 +#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/summary/summary.html:404 +#, fuzzy +msgid "Show more" +msgstr "Pokaż więcej" + +#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changeset/changeset_range.html:86 #, fuzzy, python-format -msgid "Click to open associated pull request #%s" -msgstr "Kliknij żeby otworzyć prośbę o połączenie gałęzi #%s" - -#: rhodecode/templates/changelog/changelog.html:104 -msgid "Parent" -msgstr "Rewizja" - -#: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:42 -msgid "No parents" -msgstr "Brak rewizji" - -#: rhodecode/templates/changelog/changelog.html:115 +msgid "Bookmark %s" +msgstr "Zakładki %s" + +#: rhodecode/templates/changelog/changelog.html:95 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset_range.html:92 +#, fuzzy, python-format +msgid "Tag %s" +msgstr "Tagi %s" + +#: rhodecode/templates/changelog/changelog.html:100 #: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:79 -msgid "merge" -msgstr "połącz" - -#: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:109 -#: rhodecode/templates/changeset/changeset_range.html:82 -#: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_add.html:33 -#: rhodecode/templates/files/files_edit.html:33 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -msgid "branch" -msgstr "gałąź" - -#: rhodecode/templates/changelog/changelog.html:124 -#: rhodecode/templates/changeset/changeset_range.html:88 -msgid "bookmark" -msgstr "zakładka" - -#: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:114 -#: rhodecode/templates/changeset/changeset_range.html:94 -msgid "tag" -msgstr "etykieta" - -#: rhodecode/templates/changelog/changelog.html:302 +#: rhodecode/templates/changeset/changeset_range.html:80 +#, fuzzy, python-format +msgid "Branch %s" +msgstr "Gałęzie %s" + +#: rhodecode/templates/changelog/changelog.html:258 msgid "There are no changes yet" msgstr "Nie ma jeszcze zmian" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:94 -msgid "removed" +#: rhodecode/templates/changeset/changeset.html:91 +#, fuzzy +msgid "Removed" msgstr "usunięto" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:95 -msgid "changed" +#: rhodecode/templates/changeset/changeset.html:92 +#, fuzzy +msgid "Changed" msgstr "zmiana" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:96 -msgid "added" +#: rhodecode/templates/changeset/changeset.html:93 +#, fuzzy +msgid "Added" msgstr "dodana" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:98 -#: rhodecode/templates/changeset/changeset.html:99 -#: rhodecode/templates/changeset/changeset.html:100 -#, python-format -msgid "affected %s files" +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changeset/changeset.html:97 +#, fuzzy, python-format +msgid "Affected %s files" msgstr "zarażone pliki %s" #: rhodecode/templates/changeset/changeset.html:6 @@ -3416,30 +3568,39 @@ msgid "%s Changeset" msgstr "%s Grupy zmian" -#: rhodecode/templates/changeset/changeset.html:14 -msgid "Changeset" -msgstr "Grupy zmian" - -#: rhodecode/templates/changeset/changeset.html:52 +#: rhodecode/templates/changeset/changeset.html:39 +msgid "No parents" +msgstr "Brak rewizji" + +#: rhodecode/templates/changeset/changeset.html:49 #, fuzzy msgid "No children" msgstr "Brak dzieci" -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/diff_block.html:20 -msgid "raw diff" +#: rhodecode/templates/changeset/changeset.html:62 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:44 +msgid "Changeset status" +msgstr "Status grupy zmian" + +#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/diff_block.html:23 +#, fuzzy +msgid "Raw diff" msgstr "raw różnic" -#: rhodecode/templates/changeset/changeset.html:71 -msgid "patch diff" +#: rhodecode/templates/changeset/changeset.html:68 +#, fuzzy +msgid "Patch diff" msgstr "poprawka różnic" -#: rhodecode/templates/changeset/changeset.html:72 -#: rhodecode/templates/changeset/diff_block.html:21 -msgid "download diff" +#: rhodecode/templates/changeset/changeset.html:69 +#: rhodecode/templates/changeset/diff_block.html:24 +#, fuzzy +msgid "Download diff" msgstr "pobierz różnice" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "%d comment" @@ -3448,7 +3609,7 @@ msgstr[1] "%d komentarzy" msgstr[2] "%d komentarzy" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "(%d inline)" @@ -3457,9 +3618,14 @@ msgstr[1] "(%d linii)" msgstr[2] "(%d linii)" -#: rhodecode/templates/changeset/changeset.html:122 -#: rhodecode/templates/compare/compare_diff.html:44 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:77 +msgid "merge" +msgstr "połącz" + +#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/compare/compare_diff.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -3467,9 +3633,9 @@ msgstr[1] "%s pliki zostały zmienione" msgstr[2] "%s plików zostało zmienionych" -#: rhodecode/templates/changeset/changeset.html:124 -#: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/pullrequests/pullrequest_show.html:96 +#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/compare/compare_diff.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -3477,14 +3643,31 @@ msgstr[1] "%s plików zostało zmienionych z %s inercjami i %s usunięciami" msgstr[2] "%s plików zostało zmienionych z %s inercjami i %s usunięciami" +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Showing a huge diff might take some time and resources" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +#, fuzzy +msgid "Show full diff" +msgstr "pokaż pełną historię" + #: rhodecode/templates/changeset/changeset_file_comment.html:30 -#, python-format -msgid "Status from pull request %s" +#, fuzzy, python-format +msgid "Status change on pull request #%s" msgstr "wszystkie prośby połączenia gałęzi %s" #: rhodecode/templates/changeset/changeset_file_comment.html:32 -#, python-format -msgid "Comment from pull request %s" +#, fuzzy, python-format +msgid "Comment on pull request #%s" msgstr "[komentarz] wniosek o połączenie gałęzi %s" #: rhodecode/templates/changeset/changeset_file_comment.html:57 @@ -3496,27 +3679,27 @@ msgstr "Komentując linię {1}." #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:139 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "Komentarze analizowane za pomocą %s składni od %s wsparcia." #: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:142 +#: rhodecode/templates/changeset/changeset_file_comment.html:141 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do " "użytkownika strony" #: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:162 +#: rhodecode/templates/changeset/changeset_file_comment.html:161 msgid "Comment" msgstr "Komentarz" #: rhodecode/templates/changeset/changeset_file_comment.html:75 -#: rhodecode/templates/changeset/changeset_file_comment.html:86 -msgid "Hide" -msgstr "Ukryj" +#, fuzzy +msgid "Cancel" +msgstr "zmiana" #: rhodecode/templates/changeset/changeset_file_comment.html:82 msgid "You need to be logged in to comment." @@ -3526,19 +3709,16 @@ msgid "Login now" msgstr "Zaloguj się teraz" -#: rhodecode/templates/changeset/changeset_file_comment.html:137 -msgid "Leave a comment" -msgstr "Napisz komentarz" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "Check this to change current status of code-review for this changeset" -msgstr "Zaznacz to, aby zmienić bieżący stan code przeglądu tego zestawienia zmian" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "change status" +#: rhodecode/templates/changeset/changeset_file_comment.html:86 +msgid "Hide" +msgstr "Ukryj" + +#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#, fuzzy +msgid "Change status" msgstr "zmień status" -#: rhodecode/templates/changeset/changeset_file_comment.html:164 +#: rhodecode/templates/changeset/changeset_file_comment.html:163 msgid "Comment and close" msgstr "Skomentuj i zamknij" @@ -3547,33 +3727,49 @@ msgid "%s Changesets" msgstr "%s Zestawienie zmian" -#: rhodecode/templates/changeset/changeset_range.html:29 -#: rhodecode/templates/compare/compare_diff.html:29 -msgid "Compare View" -msgstr "Wyświetl Porównanie" - -#: rhodecode/templates/changeset/changeset_range.html:29 -msgid "Show combined compare" -msgstr "Pokaż połączone porównaj" - -#: rhodecode/templates/changeset/changeset_range.html:54 +#: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" msgstr "pliki naruszone" -#: rhodecode/templates/changeset/diff_block.html:19 -msgid "show full diff for this file" +#: rhodecode/templates/changeset/diff_block.html:22 +#, fuzzy +msgid "Show full diff for this file" msgstr "pokaż pełną edycja tego pliku" -#: rhodecode/templates/changeset/diff_block.html:27 -msgid "show inline comments" +#: rhodecode/templates/changeset/diff_block.html:30 +#, fuzzy +msgid "Show inline comments" msgstr "pokaż online komentarz" -#: rhodecode/templates/compare/compare_cs.html:5 +#: rhodecode/templates/changeset/diff_block.html:55 +msgid "Show file at latest version in this repo" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:56 +msgid "Show file at initial version in this repo" +msgstr "" + +#: rhodecode/templates/compare/compare_cs.html:4 msgid "No changesets" msgstr "Brak zestawienia zmian" -#: rhodecode/templates/compare/compare_diff.html:37 -#: rhodecode/templates/pullrequests/pullrequest_show.html:87 +#: rhodecode/templates/compare/compare_cs.html:32 +#, fuzzy +msgid "Ancestor" +msgstr "gałęzie" + +#: rhodecode/templates/compare/compare_diff.html:5 +#, fuzzy, python-format +msgid "%s Compare" +msgstr "%s Porównaj" + +#: rhodecode/templates/compare/compare_diff.html:9 +#, fuzzy +msgid "Compare revisions" +msgstr "poprzednia wersja" + +#: rhodecode/templates/compare/compare_diff.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:106 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -3581,37 +3777,30 @@ msgstr[1] "Pokaż %s komentarze" msgstr[2] "Pokaż %s komentarze" -#: rhodecode/templates/compare/compare_diff.html:52 -#: rhodecode/templates/pullrequests/pullrequest_show.html:102 +#: rhodecode/templates/compare/compare_diff.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:121 msgid "No files" msgstr "Brak plików" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 -msgid "Fork" -msgstr "Gałąź" +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +msgid "confirm to show potentially huge diff" +msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:54 -#: rhodecode/templates/summary/summary.html:77 +#: rhodecode/templates/summary/summary.html:69 msgid "Mercurial repository" msgstr "Repozytorium mercurial" #: rhodecode/templates/data_table/_dt_elements.html:56 -#: rhodecode/templates/summary/summary.html:80 +#: rhodecode/templates/summary/summary.html:72 msgid "Git repository" msgstr "Repozytorium git" -#: rhodecode/templates/data_table/_dt_elements.html:63 -#: rhodecode/templates/summary/summary.html:87 -msgid "public repository" -msgstr "Publiczne repozytorium" - #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/summary/summary.html:96 -#: rhodecode/templates/summary/summary.html:97 -msgid "Fork of" -msgstr "Gałąź z" +#, fuzzy, python-format +msgid "Fork of %s" +msgstr "nazwa rozgałęzienia %s" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3639,28 +3828,45 @@ msgid "Confirm to delete this user: %s" msgstr "Potwierdź usunięcie tego użytkownika: %s" -#: rhodecode/templates/email_templates/changeset_comment.html:10 -msgid "New status$" -msgstr "Nowy status$" +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:15 +msgid "New status" +msgstr "Nowy status" + +#: rhodecode/templates/email_templates/changeset_comment.html:11 +#: rhodecode/templates/email_templates/pull_request_comment.html:9 +msgid "View this comment here" +msgstr "Zobacz ten komentarz tutaj" + +#: rhodecode/templates/email_templates/changeset_comment.html:14 +#, fuzzy +msgid "Repo" +msgstr "Moje repo" + +#: rhodecode/templates/email_templates/changeset_comment.html:16 +msgid "desc" +msgstr "" #: rhodecode/templates/email_templates/main.html:8 msgid "This is a notification from RhodeCode." msgstr "To jest powiadomienie z strony" #: rhodecode/templates/email_templates/password_reset.html:4 -msgid "Hello" -msgstr "Witaj" - -#: rhodecode/templates/email_templates/password_reset.html:6 +#, fuzzy, python-format +msgid "Hello %s" +msgstr "Witaj %s" + +#: rhodecode/templates/email_templates/password_reset.html:5 msgid "We received a request to create a new password for your account." msgstr "Otrzymaliśmy prośbę o utworzenie nowego hasła do twojego konta." -#: rhodecode/templates/email_templates/password_reset.html:8 +#: rhodecode/templates/email_templates/password_reset.html:6 msgid "You can generate it by clicking following URL" msgstr "Możesz wygenerować nowe hasło klikając w link URL poniżej:" -#: rhodecode/templates/email_templates/password_reset.html:12 -msgid "If you didn't request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:11 +#, fuzzy +msgid "If you did not request new password please ignore this email." msgstr "Jeśli nie chcesz wygenerować nowego hasła to zignoruj tą wiadomość." #: rhodecode/templates/email_templates/pull_request.html:4 @@ -3673,36 +3879,30 @@ "sprawdzić zmiany." #: rhodecode/templates/email_templates/pull_request.html:5 -msgid "title" -msgstr "tytuł" +msgid "View this pull request here" +msgstr "Wyświetl prośby pobrania tutaj" #: rhodecode/templates/email_templates/pull_request.html:6 -#: rhodecode/templates/pullrequests/pullrequest.html:115 +msgid "title" +msgstr "tytuł" + +#: rhodecode/templates/email_templates/pull_request.html:7 msgid "description" msgstr "opis" -#: rhodecode/templates/email_templates/pull_request.html:7 -msgid "View this pull request here" -msgstr "Wyświetl prośby pobrania tutaj" - #: rhodecode/templates/email_templates/pull_request.html:12 msgid "revisions for reviewing" msgstr "korekty dotyczące rewizji" -#: rhodecode/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "User %s commented on pull request #%s for repository %s" -msgstr "" -"Użytkownik %s skomentował wniosek o połączenie gałęzi #%s dla " -"repozytorium %s" - -#: rhodecode/templates/email_templates/pull_request_comment.html:10 -msgid "New status" -msgstr "Nowy status" - -#: rhodecode/templates/email_templates/pull_request_comment.html:14 -msgid "View this comment here" -msgstr "Zobacz ten komentarz tutaj" +#: rhodecode/templates/email_templates/pull_request_comment.html:3 +#, fuzzy, python-format +msgid "Pull request #%s for repository %s" +msgstr "Połączenie gałęzi #%s dla repozytorium %s" + +#: rhodecode/templates/email_templates/pull_request_comment.html:13 +#, fuzzy +msgid "Closing pull request with status" +msgstr "Żądanie statusu połączenia gałęzi" #: rhodecode/templates/email_templates/registration.html:4 msgid "A new user have registered in RhodeCode" @@ -3712,109 +3912,115 @@ msgid "View this user here" msgstr "Zobacz tego użytkownika tutaj" -#: rhodecode/templates/errors/error_document.html:46 +#: rhodecode/templates/errors/error_document.html:55 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "Zostaniesz przekierowany do %s za %s sekund" #: rhodecode/templates/files/file_diff.html:4 -#, python-format -msgid "%s File diff" +#, fuzzy, python-format +msgid "%s File Diff" msgstr "%s Pliki różnic" -#: rhodecode/templates/files/file_diff.html:12 +#: rhodecode/templates/files/file_diff.html:8 msgid "File diff" msgstr "Pliki różnic" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:74 -#, python-format -msgid "%s files" +#: rhodecode/templates/files/files.html:76 +#, fuzzy, python-format +msgid "%s Files" msgstr "Pliki %s" -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:351 -msgid "files" -msgstr "pliki" +#: rhodecode/templates/files/files.html:30 +#: rhodecode/templates/files/files_add.html:31 +#: rhodecode/templates/files/files_edit.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +#, fuzzy +msgid "Branch" +msgstr "gałąź" #: rhodecode/templates/files/files_add.html:4 -#: rhodecode/templates/files/files_edit.html:4 -#, python-format -msgid "%s Edit file" -msgstr "Edytuj plik %s" +#, fuzzy, python-format +msgid "%s Files Add" +msgstr "Pliki %s" #: rhodecode/templates/files/files_add.html:19 -msgid "add file" +#, fuzzy +msgid "Add file" msgstr "dodaj plik" -#: rhodecode/templates/files/files_add.html:40 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:78 msgid "Add new file" msgstr "Dodaj nowy plik" -#: rhodecode/templates/files/files_add.html:45 +#: rhodecode/templates/files/files_add.html:43 msgid "File Name" msgstr "Nazwa Pliku" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:56 msgid "or" msgstr "lub" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:54 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:52 msgid "Upload file" msgstr "Dodaj plik" -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:56 msgid "Create new file" msgstr "Utwórz nowy plik" -#: rhodecode/templates/files/files_add.html:63 -#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_add.html:61 +#: rhodecode/templates/files/files_edit.html:37 #: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Położenie" -#: rhodecode/templates/files/files_add.html:67 +#: rhodecode/templates/files/files_add.html:65 msgid "use / to separate directories" msgstr "Użyj / do oddzielenia katalogów" -#: rhodecode/templates/files/files_add.html:77 -#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 #: rhodecode/templates/shortlog/shortlog_data.html:6 -msgid "commit message" +#, fuzzy +msgid "Commit message" msgstr "komentarz" -#: rhodecode/templates/files/files_add.html:81 -#: rhodecode/templates/files/files_edit.html:67 +#: rhodecode/templates/files/files_add.html:79 +#: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "Zatwierdź zmiany" #: rhodecode/templates/files/files_browser.html:13 -msgid "view" +#, fuzzy +msgid "View" msgstr "widok" #: rhodecode/templates/files/files_browser.html:14 -msgid "previous revision" +#, fuzzy +msgid "Previous revision" msgstr "poprzednia wersja" #: rhodecode/templates/files/files_browser.html:16 -msgid "next revision" +#, fuzzy +msgid "Next revision" msgstr "następna wersja" #: rhodecode/templates/files/files_browser.html:23 -msgid "follow current branch" +#, fuzzy +msgid "Follow current branch" msgstr "śledź mierzącą gałąź" #: rhodecode/templates/files/files_browser.html:27 -msgid "search file list" +#, fuzzy +msgid "Search file list" msgstr "lista szukanych plików" -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -msgid "add new file" -msgstr "dodaj nowy plik" - #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." msgstr "Wczytywanie listy plików..." @@ -3839,31 +4045,41 @@ msgid "Last committer" msgstr "Autor" +#: rhodecode/templates/files/files_edit.html:4 +#, fuzzy, python-format +msgid "%s Files Edit" +msgstr "Pliki %s" + #: rhodecode/templates/files/files_edit.html:19 -msgid "edit file" +#, fuzzy +msgid "Edit file" msgstr "edytuj plik" -#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -msgid "show annotation" +#, fuzzy +msgid "Show annotation" msgstr "pokaż adnotacje" -#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_edit.html:48 #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 -msgid "show as raw" +#, fuzzy +msgid "Show as raw" msgstr "wyświetl jako raw" -#: rhodecode/templates/files/files_edit.html:51 +#: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -msgid "download as raw" +#, fuzzy +msgid "Download as raw" msgstr "Pobierz jako raw" -#: rhodecode/templates/files/files_edit.html:54 -msgid "source" +#: rhodecode/templates/files/files_edit.html:52 +#, fuzzy +msgid "Source" msgstr "źródło" -#: rhodecode/templates/files/files_edit.html:59 +#: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" msgstr "Edycja pliku" @@ -3872,15 +4088,18 @@ msgstr "Historia" #: rhodecode/templates/files/files_history_box.html:9 -msgid "diff to revision" +#, fuzzy +msgid "Diff to revision" msgstr "różnice do rewizji" #: rhodecode/templates/files/files_history_box.html:10 -msgid "show at revision" +#, fuzzy +msgid "Show at revision" msgstr "wskaż zmiany" #: rhodecode/templates/files/files_history_box.html:11 -msgid "show full history" +#, fuzzy +msgid "Show full history" msgstr "pokaż pełną historię" #: rhodecode/templates/files/files_history_box.html:16 @@ -3896,17 +4115,19 @@ msgstr "Załaduj historię pliku" #: rhodecode/templates/files/files_source.html:21 -msgid "show source" +#, fuzzy +msgid "Show source" msgstr "pokaż źródło" #: rhodecode/templates/files/files_source.html:29 #, fuzzy, python-format -msgid "edit on branch:%s" +msgid "Edit on branch:%s" msgstr "Usunięta gałąź: %s" #: rhodecode/templates/files/files_source.html:31 -msgid "edit on branch:?" -msgstr "" +#, fuzzy +msgid "Edit on branch:?" +msgstr "Usunięta gałąź: %s" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -3938,9 +4159,11 @@ msgid "%s Followers" msgstr "Obserwatorzy %s" -#: rhodecode/templates/followers/followers.html:13 -msgid "followers" -msgstr "obserwatorzy" +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:184 +msgid "Followers" +msgstr "Obserwowane" #: rhodecode/templates/followers/followers_data.html:12 msgid "Started following -" @@ -3951,32 +4174,33 @@ msgid "%s Fork" msgstr "Gałęzi %s" -#: rhodecode/templates/forks/fork.html:31 +#: rhodecode/templates/forks/fork.html:28 msgid "Fork name" msgstr "Nazwa rozgałęzienia" -#: rhodecode/templates/forks/fork.html:68 +#: rhodecode/templates/forks/fork.html:65 msgid "Private" msgstr "Prywatny" -#: rhodecode/templates/forks/fork.html:77 +#: rhodecode/templates/forks/fork.html:74 msgid "Copy permissions" msgstr "Skopiuj uprawnienia" -#: rhodecode/templates/forks/fork.html:81 +#: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" msgstr "Skopiuj zezwolenia z rozwidlenia repozytorium" -#: rhodecode/templates/forks/fork.html:86 +#: rhodecode/templates/forks/fork.html:84 msgid "Update after clone" msgstr "Aktualizuj po klonowaniu" -#: rhodecode/templates/forks/fork.html:90 +#: rhodecode/templates/forks/fork.html:88 msgid "Checkout source after making a clone" msgstr "Sprawdź źródło po wykonaniu klonowania" -#: rhodecode/templates/forks/fork.html:94 -msgid "fork this repository" +#: rhodecode/templates/forks/fork.html:93 +#, fuzzy +msgid "Fork this repository" msgstr "gałąź tego repozytorium" #: rhodecode/templates/forks/forks.html:5 @@ -3984,18 +4208,17 @@ msgid "%s Forks" msgstr "Gałęzi %s" -#: rhodecode/templates/forks/forks.html:13 -msgid "forks" -msgstr "gałąź" +#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/summary/summary.html:189 +#: rhodecode/templates/summary/summary.html:190 +msgid "Forks" +msgstr "Gałęzie" #: rhodecode/templates/forks/forks_data.html:17 -msgid "forked" +#, fuzzy +msgid "Forked" msgstr "rozgałęziony" -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "Porównaj rozwidlenie" - #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "Nie ma jeszcze gałęzi" @@ -4009,21 +4232,15 @@ msgstr "Dziennik kanału RSS" #: rhodecode/templates/journal/journal.html:32 -#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "Odśwież" #: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 -msgid "RSS feed" -msgstr "Kanał RSS" - -#: rhodecode/templates/journal/journal.html:38 -#: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "Kanał ATOM" -#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:51 msgid "Watched" msgstr "Obserwowane" @@ -4031,6 +4248,11 @@ msgid "No entries yet" msgstr "Brak wpisów jeszcze" +#: rhodecode/templates/journal/public_journal.html:4 +#: rhodecode/templates/journal/public_journal.html:21 +msgid "Public Journal" +msgstr "Dziennik Publiczny" + #: rhodecode/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "Publiczny dziennik kanału ATOM" @@ -4039,75 +4261,61 @@ msgid "RSS public journal feed" msgstr "Publiczny dziennik kanału RSS" -#: rhodecode/templates/journal/public_journal.html:21 -msgid "Public Journal" -msgstr "Dziennik Publiczny" - #: rhodecode/templates/pullrequests/pullrequest.html:4 -#: rhodecode/templates/pullrequests/pullrequest.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" msgstr "Nowa prośba o połączenie gałęzi" -#: rhodecode/templates/pullrequests/pullrequest.html:54 -msgid "refresh overview" -msgstr "odśwież informacje" - -#: rhodecode/templates/pullrequests/pullrequest.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:52 msgid "Detailed compare view" msgstr "Szczegółowe porównanie widoku" -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:118 +#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "Recenzje wniosków połączenia gałęzi" -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "właściciel" -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:145 +#: rhodecode/templates/pullrequests/pullrequest.html:77 msgid "Add reviewer to this pull request." msgstr "Pokarz wszystkie zmiany" -#: rhodecode/templates/pullrequests/pullrequest.html:97 +#: rhodecode/templates/pullrequests/pullrequest.html:83 msgid "Create new pull request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest.html:92 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "Tytuł" -#: rhodecode/templates/pullrequests/pullrequest.html:123 +#: rhodecode/templates/pullrequests/pullrequest.html:109 msgid "Send pull request" msgstr "Wyślij prośbę o połączenie gałęzi" -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "Closed %s" -msgstr "Zamknięty %s" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "with status %s" -msgstr "stanu z %s" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:31 -msgid "Status" -msgstr "Status" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:36 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#, fuzzy, python-format +msgid "%s Pull Request #%s" +msgstr "%s Połączonych gałęzi #%s" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +msgid "Review status" +msgstr "Nowy status" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" msgstr "Żądanie statusu połączenia gałęzi" -#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" msgstr "Nie ma jeszcze recenzenta" -#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -4115,77 +4323,70 @@ msgstr[1] "%d recenzenci" msgstr[2] "%d recenzentów" -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 -msgid "pull request was reviewed by all reviewers" +#: rhodecode/templates/pullrequests/pullrequest_show.html:59 +#, fuzzy +msgid "Pull request was reviewed by all reviewers" msgstr "połączenie gałęzi zostało zweryfikowane przez wszystkich recenzentów" -#: rhodecode/templates/pullrequests/pullrequest_show.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Origin repository" msgstr "Repozytorium git" -#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" msgstr "Utworzono" -#: rhodecode/templates/pullrequests/pullrequest_show.html:83 +#: rhodecode/templates/pullrequests/pullrequest_show.html:102 msgid "Compare view" msgstr "Wyświetl porównanie" -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "reviewer" msgstr "recenzent" +#: rhodecode/templates/pullrequests/pullrequest_show.html:164 +#, fuzzy +msgid "Add or remove reviewer to this pull request." +msgstr "Pokarz wszystkie zmiany" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:168 +#, fuzzy +msgid "Save changes" +msgstr "Bez zmian" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -msgid "all pull requests" -msgstr "wszystkie prośby połączenia gałęzi" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 -msgid "All pull requests" -msgstr "Wszystkie prośby połączenia gałęzi" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 -msgid "Closed" -msgstr "Zamknięte" +#, fuzzy, python-format +msgid "%s Pull Requests" +msgstr "%s Moje prośby połączenia gałęzi" #: rhodecode/templates/search/search.html:6 -#, python-format -msgid "Search \"%s\" in repository: %s" -msgstr "Wyszukiwanie \"%s\" w repozytorium: %s" +#, fuzzy +msgid "Search repository" +msgstr "Szukaj w repozytorium: %s" #: rhodecode/templates/search/search.html:8 -#, python-format -msgid "Search \"%s\" in all repositories" -msgstr "Wyszukiwanie \"%s\" w wszystkich repozytoriach" - -#: rhodecode/templates/search/search.html:12 -#: rhodecode/templates/search/search.html:32 -#, python-format -msgid "Search in repository: %s" -msgstr "Szukaj w repozytorium: %s" - -#: rhodecode/templates/search/search.html:14 -#: rhodecode/templates/search/search.html:34 +#: rhodecode/templates/search/search.html:16 msgid "Search in all repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: rhodecode/templates/search/search.html:48 +#: rhodecode/templates/search/search.html:50 msgid "Search term" msgstr "Szukana fraza" -#: rhodecode/templates/search/search.html:60 +#: rhodecode/templates/search/search.html:62 msgid "Search in" msgstr "Szukaj w" -#: rhodecode/templates/search/search.html:63 +#: rhodecode/templates/search/search.html:65 msgid "File contents" msgstr "Zawartość pliku" -#: rhodecode/templates/search/search.html:64 +#: rhodecode/templates/search/search.html:66 msgid "Commit messages" msgstr "Komunikaty" -#: rhodecode/templates/search/search.html:65 +#: rhodecode/templates/search/search.html:67 msgid "File names" msgstr "Nazwy plików" @@ -4195,40 +4396,25 @@ msgid "Permission denied" msgstr "Brak uprawnień" -#: rhodecode/templates/settings/repo_settings.html:5 -#, python-format -msgid "%s Settings" -msgstr "Ustawienia %s" - -#: rhodecode/templates/settings/repo_settings.html:102 -msgid "Delete repository" -msgstr "Usuń repozytorium" - -#: rhodecode/templates/settings/repo_settings.html:109 -msgid "Remove repo" -msgstr "Usuń repo" - #: rhodecode/templates/shortlog/shortlog.html:5 -#, python-format -msgid "%s Shortlog" -msgstr "%s Lista zmian" - +#, fuzzy, python-format +msgid "%s Lightweight Changelog" +msgstr "%s Prosta lista zmian" + +#: rhodecode/templates/shortlog/shortlog.html:11 #: rhodecode/templates/shortlog/shortlog.html:15 -#: rhodecode/templates/shortlog/shortlog.html:19 -msgid "shortlog" -msgstr "lista zmian" - -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "rewizja" +msgid "Lightweight Changelog" +msgstr "Użyj lekkiego pulpitu" #: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "age" +#, fuzzy +msgid "Age" msgstr "ostatnia zmiana" -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "autor" +#: rhodecode/templates/shortlog/shortlog_data.html:20 +#, fuzzy, python-format +msgid "Click to open associated pull request #%s" +msgstr "Kliknij żeby otworzyć prośbę o połączenie gałęzi #%s" #: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" @@ -4247,156 +4433,170 @@ msgid "%s Summary" msgstr "Podsumowanie %s" -#: rhodecode/templates/summary/summary.html:12 -msgid "summary" -msgstr "Podsumowanie" - -#: rhodecode/templates/summary/summary.html:20 -#, python-format -msgid "repo %s ATOM feed" -msgstr "repo %s kanał ATOM" - -#: rhodecode/templates/summary/summary.html:21 -#, python-format -msgid "repo %s RSS feed" -msgstr "repo %s kanał RSS" - -#: rhodecode/templates/summary/summary.html:49 -#: rhodecode/templates/summary/summary.html:52 -msgid "ATOM" -msgstr "ATOM" - -#: rhodecode/templates/summary/summary.html:70 +#: rhodecode/templates/summary/summary.html:16 +#, fuzzy, python-format +msgid "%s ATOM feed" +msgstr "%s ATOM" + +#: rhodecode/templates/summary/summary.html:17 +#, fuzzy, python-format +msgid "%s RSS feed" +msgstr "%s RSS" + +#: rhodecode/templates/summary/summary.html:62 #, python-format msgid "Repository locked by %s" msgstr "Repozytorium zablokowane przez %s" -#: rhodecode/templates/summary/summary.html:72 +#: rhodecode/templates/summary/summary.html:64 msgid "Repository unlocked" msgstr "Repozytorium odblokowane" -#: rhodecode/templates/summary/summary.html:91 +#: rhodecode/templates/summary/summary.html:83 #, python-format msgid "Non changable ID %s" msgstr "Brak ID pełnej zmiany %s" -#: rhodecode/templates/summary/summary.html:96 -msgid "public" +#: rhodecode/templates/summary/summary.html:88 +#, fuzzy +msgid "Public" msgstr "publiczny" -#: rhodecode/templates/summary/summary.html:104 -msgid "remote clone" +#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:89 +msgid "Fork of" +msgstr "Gałąź z" + +#: rhodecode/templates/summary/summary.html:96 +#, fuzzy +msgid "Remote clone" msgstr "zdalne klonowanie" -#: rhodecode/templates/summary/summary.html:125 +#: rhodecode/templates/summary/summary.html:117 msgid "Contact" msgstr "Kontakt" -#: rhodecode/templates/summary/summary.html:139 +#: rhodecode/templates/summary/summary.html:131 msgid "Clone url" msgstr "Url klonowania" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:136 msgid "Show by Name" msgstr "Pokaż nazwę" -#: rhodecode/templates/summary/summary.html:143 +#: rhodecode/templates/summary/summary.html:137 msgid "Show by ID" msgstr "Pokaż ID" +#: rhodecode/templates/summary/summary.html:143 +msgid "Trending files" +msgstr "Statystyki" + #: rhodecode/templates/summary/summary.html:151 -msgid "Trending files" -msgstr "Statystyki" +#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "włącz" #: rhodecode/templates/summary/summary.html:159 -#: rhodecode/templates/summary/summary.html:175 -#: rhodecode/templates/summary/summary.html:203 -msgid "enable" -msgstr "włącz" - -#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "Pobierz" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:163 msgid "There are no downloads yet" msgstr "Nie pobrano jeszcze plików" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:165 msgid "Downloads are disabled for this repository" msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" -#: rhodecode/templates/summary/summary.html:179 +#: rhodecode/templates/summary/summary.html:171 msgid "Download as zip" msgstr "Pobierz jako zip" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" msgstr "Zaznacz tu żeby pobrać archiwum z subrepozytorium" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "with subrepos" msgstr "z subrepozytorium" -#: rhodecode/templates/summary/summary.html:195 +#: rhodecode/templates/summary/summary.html:197 +#, fuzzy +msgid "Repository Size" +msgstr "repozytoria" + +#: rhodecode/templates/summary/summary.html:204 +#: rhodecode/templates/summary/summary.html:206 +#, fuzzy +msgid "Feed" +msgstr "Kanał RSS" + +#: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "komunikaty aktywne w ciągu dnia / autor" -#: rhodecode/templates/summary/summary.html:206 +#: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "Statystyki zebrane: " -#: rhodecode/templates/summary/summary.html:227 -msgid "Shortlog" -msgstr "Lista zmian" - -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:256 +#, fuzzy +msgid "Latest changes" +msgstr "Ostatnia aktywność" + +#: rhodecode/templates/summary/summary.html:258 msgid "Quick start" msgstr "Szybki start" -#: rhodecode/templates/summary/summary.html:243 +#: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file at revision '%s'" msgstr "Plik readme w rewizji '%s'" -#: rhodecode/templates/summary/summary.html:246 +#: rhodecode/templates/summary/summary.html:275 msgid "Permalink to this readme" msgstr "Link do tego readme" -#: rhodecode/templates/summary/summary.html:304 +#: rhodecode/templates/summary/summary.html:333 #, python-format msgid "Download %s as %s" msgstr "Pobierz %s jak %s" -#: rhodecode/templates/summary/summary.html:661 +#: rhodecode/templates/summary/summary.html:380 +msgid "files" +msgstr "pliki" + +#: rhodecode/templates/summary/summary.html:690 msgid "commits" msgstr "komunikaty" -#: rhodecode/templates/summary/summary.html:662 +#: rhodecode/templates/summary/summary.html:691 msgid "files added" msgstr "pliki dodane" -#: rhodecode/templates/summary/summary.html:663 +#: rhodecode/templates/summary/summary.html:692 msgid "files changed" msgstr "pliki zmienione" -#: rhodecode/templates/summary/summary.html:664 +#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "pliki usunięte" -#: rhodecode/templates/summary/summary.html:667 +#: rhodecode/templates/summary/summary.html:695 msgid "commit" msgstr "komunikaty" -#: rhodecode/templates/summary/summary.html:668 +#: rhodecode/templates/summary/summary.html:696 msgid "file added" msgstr "plik dodany" -#: rhodecode/templates/summary/summary.html:669 +#: rhodecode/templates/summary/summary.html:697 msgid "file changed" msgstr "plik zmieniony" -#: rhodecode/templates/summary/summary.html:670 +#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "plik usunięty" @@ -4405,7 +4605,7 @@ msgid "%s Tags" msgstr "Etykiety pliku %s" -#: rhodecode/templates/tags/tags.html:29 +#: rhodecode/templates/tags/tags.html:26 msgid "Compare tags" msgstr "Porównaj tagi"
--- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Fri Apr 05 14:09:23 2013 +0200 +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Fri Apr 05 19:21:52 2013 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-01-28 00:24+0100\n" +"POT-Creation-Date: 2013-04-05 10:19-0700\n" "PO-Revision-Date: 2012-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann <augusto.herrmann@gmail.com>\n" "Language-Team: pt_BR <LL@li.org>\n" @@ -22,11 +22,13 @@ msgstr "Todos os Ramos" #: rhodecode/controllers/changeset.py:83 -msgid "show white space" +#, fuzzy +msgid "Show white space" msgstr "mostrar espaços em branco" #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 -msgid "ignore white space" +#, fuzzy +msgid "Ignore white space" msgstr "ignorar espaços em branco" #: rhodecode/controllers/changeset.py:163 @@ -35,7 +37,7 @@ msgstr "contexto de %s linhas" #: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:416 +#: rhodecode/controllers/pullrequests.py:438 #, fuzzy, python-format msgid "Status change -> %s" msgstr "Última alteração" @@ -46,8 +48,8 @@ "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:121 +#: rhodecode/controllers/compare.py:74 +#: rhodecode/controllers/pullrequests.py:167 #: rhodecode/controllers/shortlog.py:100 #, fuzzy msgid "There are no changesets yet" @@ -94,109 +96,118 @@ msgstr "%s - feed %s" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:137 -#: rhodecode/templates/changeset/changeset.html:149 -#: rhodecode/templates/compare/compare_diff.html:62 -#: rhodecode/templates/compare/compare_diff.html:73 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 -#: rhodecode/templates/pullrequests/pullrequest_show.html:171 +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Changeset was too big and was cut off..." msgstr "Conjunto de mudanças era grande demais e foi cortado..." -#: rhodecode/controllers/feed.py:92 -#, fuzzy -msgid "commited on" +#: rhodecode/controllers/feed.py:91 +#, fuzzy, python-format +msgid "%s committed on %s" msgstr "commit" -#: rhodecode/controllers/files.py:86 -#, fuzzy -msgid "click here to add new file" +#: rhodecode/controllers/files.py:88 +#, fuzzy +msgid "Click here to add new file" msgstr "adicionar novo arquivo" -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/files.py:89 #, python-format msgid "There are no files yet %s" msgstr "Ainda não há arquivos %s" -#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338 +#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:281 +#: rhodecode/controllers/files.py:279 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:295 +#: rhodecode/controllers/files.py:293 #, fuzzy, python-format msgid "Edited file %s via RhodeCode" msgstr "Editado %s via RhodeCode" -#: rhodecode/controllers/files.py:311 +#: rhodecode/controllers/files.py:309 msgid "No changes" msgstr "Sem alterações" -#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384 +#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390 +#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: rhodecode/controllers/files.py:350 +#: rhodecode/controllers/files.py:347 #, fuzzy msgid "Added file via RhodeCode" msgstr "Adicionado %s via RhodeCode" -#: rhodecode/controllers/files.py:370 +#: rhodecode/controllers/files.py:364 msgid "No content" msgstr "Nenhum conteúdo" -#: rhodecode/controllers/files.py:374 +#: rhodecode/controllers/files.py:368 msgid "No filename" msgstr "Nenhum nomes de arquivo" -#: rhodecode/controllers/files.py:416 -msgid "downloads disabled" +#: rhodecode/controllers/files.py:372 +msgid "Location must be relative path and must not contain .. in path" +msgstr "" + +#: rhodecode/controllers/files.py:420 +#, fuzzy +msgid "Downloads disabled" msgstr "downloads desabilitados" -#: rhodecode/controllers/files.py:427 +#: rhodecode/controllers/files.py:431 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: rhodecode/controllers/files.py:429 +#: rhodecode/controllers/files.py:433 msgid "Empty repository" msgstr "Repositório vazio" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:435 msgid "Unknown archive type" msgstr "Arquivo de tipo desconhecido" -#: rhodecode/controllers/files.py:576 -#: rhodecode/templates/changeset/changeset_range.html:13 -#: rhodecode/templates/changeset/changeset_range.html:31 +#: rhodecode/controllers/files.py:617 +#: rhodecode/templates/changeset/changeset_range.html:9 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564 +#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 +#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "Ramos" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78 -#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575 +#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 +#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "Etiquetas" -#: rhodecode/controllers/forks.py:165 -#, python-format -msgid "forked %s repository as %s" +#: rhodecode/controllers/forks.py:175 +#, fuzzy, python-format +msgid "Forked repository %s as %s" msgstr "bifurcado repositório %s como %s" -#: rhodecode/controllers/forks.py:179 +#: rhodecode/controllers/forks.py:189 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" @@ -207,20 +218,20 @@ msgstr "Diário público" #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 -#: rhodecode/templates/base/base.html:238 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "diário" -#: rhodecode/controllers/login.py:142 -msgid "You have successfully registered into rhodecode" +#: rhodecode/controllers/login.py:138 +#, fuzzy +msgid "You have successfully registered into RhodeCode" msgstr "Você se registrou com sucesso no rhodecode" -#: rhodecode/controllers/login.py:163 +#: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: rhodecode/controllers/login.py:183 +#: rhodecode/controllers/login.py:179 msgid "" "Your password reset was successful, new password has been sent to your " "email" @@ -228,35 +239,56 @@ "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " "seu e-mail" -#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570 +#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/email_templates/changeset_comment.html:15 +msgid "Changeset" +msgstr "Conjunto de Mudanças" + +#: rhodecode/controllers/pullrequests.py:128 +msgid "Special" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:129 +#, fuzzy +msgid "Peer branches" +msgstr "ramos" + +#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Marcadores" -#: rhodecode/controllers/pullrequests.py:190 +#: rhodecode/controllers/pullrequests.py:228 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:192 -#, fuzzy -msgid "error during creation of pull request" +#: rhodecode/controllers/pullrequests.py:230 +#, fuzzy +msgid "Error creating pull request" msgstr "ocorreu um erro ao criar o usuário %s" -#: rhodecode/controllers/pullrequests.py:224 +#: rhodecode/controllers/pullrequests.py:251 #, fuzzy msgid "Successfully opened new pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:227 +#: rhodecode/controllers/pullrequests.py:254 #, fuzzy msgid "Error occurred during sending pull request" msgstr "ocorreu um erro ao criar o repositório %s" -#: rhodecode/controllers/pullrequests.py:260 +#: rhodecode/controllers/pullrequests.py:287 #, fuzzy msgid "Successfully deleted pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:451 +#: rhodecode/controllers/pullrequests.py:441 +msgid "Closing with" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:478 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" @@ -272,58 +304,12 @@ msgid "An error occurred during this search operation" msgstr "Ocorreu um erro durante essa operação de busca" -#: rhodecode/controllers/settings.py:120 -#: rhodecode/controllers/admin/repos.py:254 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Repositório %s atualizado com sucesso" - -#: rhodecode/controllers/settings.py:138 -#: rhodecode/controllers/admin/repos.py:272 -#, python-format -msgid "error occurred during update of repository %s" -msgstr "ocorreu um erro ao atualizar o repositório %s" - -#: rhodecode/controllers/settings.py:163 -#: rhodecode/controllers/admin/repos.py:297 -#, python-format -msgid "deleted repository %s" -msgstr "excluído o repositório %s" - -#: rhodecode/controllers/settings.py:167 -#: rhodecode/controllers/admin/repos.py:307 -#: rhodecode/controllers/admin/repos.py:313 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Ocorreu um erro durante a exclusão de %s" - -#: rhodecode/controllers/settings.py:186 -#, fuzzy -msgid "unlocked" -msgstr "destravar" - -#: rhodecode/controllers/settings.py:189 -#, fuzzy -msgid "locked" -msgstr "destravar" - -#: rhodecode/controllers/settings.py:191 -#, fuzzy, python-format -msgid "Repository has been %s" -msgstr "bifurcado repositório %s como %s" - -#: rhodecode/controllers/settings.py:195 -#: rhodecode/controllers/admin/repos.py:405 -#, fuzzy -msgid "An error occurred during unlocking" -msgstr "Ocorreu um erro durante essa operação" - -#: rhodecode/controllers/summary.py:140 +#: rhodecode/controllers/summary.py:141 msgid "No data loaded yet" msgstr "Ainda não há dados carregados" -#: rhodecode/controllers/summary.py:144 -#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/controllers/summary.py:147 +#: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" @@ -334,7 +320,7 @@ #: rhodecode/controllers/admin/defaults.py:110 #, fuzzy -msgid "error occurred during update of defaults" +msgid "Error occurred during update of defaults" msgstr "ocorreu um erro ao atualizar o usuário %s" #: rhodecode/controllers/admin/ldap_settings.py:50 @@ -390,7 +376,8 @@ msgstr "Não foi possível ativar LDAP. A biblioteca \"python-ldap\" está faltando." #: rhodecode/controllers/admin/ldap_settings.py:147 -msgid "error occurred during update of ldap settings" +#, fuzzy +msgid "Error occurred during update of ldap settings" msgstr "ocorreu um erro ao atualizar as configurações de LDAP" #: rhodecode/controllers/admin/permissions.py:60 @@ -413,45 +400,46 @@ #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 -#: rhodecode/templates/admin/repos/repo_add.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:9 +#: rhodecode/templates/admin/repos/repo_add.html:10 +#: rhodecode/templates/admin/repos/repo_add.html:14 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:133 #: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/admin/users/users.html:85 #: 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:203 -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 +#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:300 msgid "Admin" msgstr "Administrador" #: rhodecode/controllers/admin/permissions.py:70 -msgid "disabled" -msgstr "desabilitado" - -#: rhodecode/controllers/admin/permissions.py:72 -msgid "allowed with manual account activation" -msgstr "permitido com ativação manual de conta" - -#: rhodecode/controllers/admin/permissions.py:74 -msgid "allowed with automatic account activation" -msgstr "permitido com ativação automática de conta" - #: rhodecode/controllers/admin/permissions.py:76 #: rhodecode/controllers/admin/permissions.py:79 msgid "Disabled" msgstr "Desabilitado" +#: rhodecode/controllers/admin/permissions.py:72 +#, fuzzy +msgid "Allowed with manual account activation" +msgstr "permitido com ativação manual de conta" + +#: rhodecode/controllers/admin/permissions.py:74 +#, fuzzy +msgid "Allowed with automatic account activation" +msgstr "permitido com ativação automática de conta" + #: rhodecode/controllers/admin/permissions.py:77 #: rhodecode/controllers/admin/permissions.py:80 msgid "Enabled" @@ -462,156 +450,233 @@ msgstr "Permissões padrões atualizadas com sucesso" #: rhodecode/controllers/admin/permissions.py:142 -msgid "error occurred during update of permissions" +#, fuzzy +msgid "Error occurred during update of permissions" msgstr "ocorreu um erro ao atualizar as permissões" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:127 msgid "--REMOVE FORK--" msgstr "--REMOVER BIFURCAÇÂO--" -#: rhodecode/controllers/admin/repos.py:162 -#, python-format -msgid "created repository %s from %s" +#: rhodecode/controllers/admin/repos.py:168 +#, fuzzy, python-format +msgid "Created repository %s from %s" msgstr "repositório %s criado a partir de %s" -#: rhodecode/controllers/admin/repos.py:166 -#, python-format -msgid "created repository %s" +#: rhodecode/controllers/admin/repos.py:174 +#, fuzzy, python-format +msgid "Created repository %s" msgstr "repositório %s criado" #: rhodecode/controllers/admin/repos.py:197 +#, fuzzy, python-format +msgid "Error creating repository %s" +msgstr "repositório %s criado" + +#: rhodecode/controllers/admin/repos.py:266 #, python-format -msgid "error occurred during creation of repository %s" -msgstr "ocorreu um erro ao criar o repositório %s" - -#: rhodecode/controllers/admin/repos.py:302 +msgid "Repository %s updated successfully" +msgstr "Repositório %s atualizado com sucesso" + +#: rhodecode/controllers/admin/repos.py:284 +#, fuzzy, python-format +msgid "Error occurred during update of repository %s" +msgstr "ocorreu um erro ao atualizar o repositório %s" + +#: rhodecode/controllers/admin/repos.py:311 +#: rhodecode/controllers/api/api.py:877 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/api/api.py:879 +#, fuzzy, python-format +msgid "Deleted %s forks" +msgstr "excluído o repositório %s" + +#: rhodecode/controllers/admin/repos.py:319 +#, fuzzy, python-format +msgid "Deleted repository %s" +msgstr "excluído o repositório %s" + +#: rhodecode/controllers/admin/repos.py:322 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:327 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "Ocorreu um erro durante a exclusão de %s" + +#: rhodecode/controllers/admin/repos.py:365 +#, fuzzy +msgid "Repository permissions updated" +msgstr "Criação de repositório" + +#: rhodecode/controllers/admin/repos.py:384 msgid "An error occurred during deletion of repository user" msgstr "Ocorreu um erro ao excluir usuário de repositório" -#: rhodecode/controllers/admin/repos.py:350 -msgid "An error occurred during deletion of repository users groups" +#: rhodecode/controllers/admin/repos.py:403 +#, fuzzy +msgid "An error occurred during deletion of repository user groups" msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório" -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:421 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:438 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: rhodecode/controllers/admin/repos.py:425 +#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:485 +#, fuzzy +msgid "An error occurred during unlocking" +msgstr "Ocorreu um erro durante essa operação" + +#: rhodecode/controllers/admin/repos.py:476 +#, fuzzy +msgid "Unlocked" +msgstr "destravar" + +#: rhodecode/controllers/admin/repos.py:479 +#, fuzzy +msgid "Locked" +msgstr "destravar" + +#: rhodecode/controllers/admin/repos.py:481 +#, fuzzy, python-format +msgid "Repository has been %s" +msgstr "bifurcado repositório %s como %s" + +#: rhodecode/controllers/admin/repos.py:505 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:509 msgid "An error occurred during setting this repository in public journal" msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" -#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301 +#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "Descompasso de Token" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:527 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:449 +#: rhodecode/controllers/admin/repos.py:529 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:545 msgid "Nothing" msgstr "Nada" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:547 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: rhodecode/controllers/admin/repos.py:471 +#: rhodecode/controllers/admin/repos.py:551 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/repos_groups.py:136 -#, python-format -msgid "created repos group %s" +#: rhodecode/controllers/admin/repos.py:590 +#, fuzzy +msgid "An error occurred during creation of field" +msgstr "ocorreu um erro ao criar o usuário %s" + +#: rhodecode/controllers/admin/repos.py:604 +#, fuzzy +msgid "An error occurred during removal of field" +msgstr "Ocorreu um erro durante essa operação" + +#: rhodecode/controllers/admin/repos_groups.py:145 +#, fuzzy, python-format +msgid "Created repository group %s" msgstr "criado grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:148 -#, python-format -msgid "error occurred during creation of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:157 +#, fuzzy, python-format +msgid "Error occurred during creation of repository group %s" msgstr "ccorreu um erro ao criar grupo de repositório %s" -#: rhodecode/controllers/admin/repos_groups.py:205 -#, python-format -msgid "updated repos group %s" -msgstr "atualizado grupo de repositórios %s" +#: rhodecode/controllers/admin/repos_groups.py:214 +#: rhodecode/controllers/admin/repos_groups.py:286 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:220 -#, python-format -msgid "error occurred during update of repos group %s" +#, fuzzy, python-format +msgid "Updated repository group %s" +msgstr "atualizado grupo de repositórios %s" + +#: rhodecode/controllers/admin/repos_groups.py:235 +#, fuzzy, python-format +msgid "Error occurred during update of repository group %s" msgstr "ocorreu um erro ao atualizar grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:253 #, 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" -#: rhodecode/controllers/admin/repos_groups.py:246 -#, python-format -msgid "removed repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:260 +#, fuzzy, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "Esse grupo contém %s repositórios e não pode ser excluído" + +#: rhodecode/controllers/admin/repos_groups.py:266 +#, fuzzy, python-format +msgid "Removed repository group %s" msgstr "removido grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:252 -msgid "Cannot delete this group it still contains subgroups" -msgstr "Nao é possível excluir este grupo pois ele ainda contém subgrupos" - -#: rhodecode/controllers/admin/repos_groups.py:257 -#: rhodecode/controllers/admin/repos_groups.py:262 -#, python-format -msgid "error occurred during deletion of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:271 +#, fuzzy, python-format +msgid "Error occurred during deletion of repos group %s" msgstr "ccorreu um erro ao excluir grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:283 +#: rhodecode/controllers/admin/repos_groups.py:297 msgid "An error occurred during deletion of group user" msgstr "Ocorreu um erro ao excluir o usuário de grupo" -#: rhodecode/controllers/admin/repos_groups.py:304 -msgid "An error occurred during deletion of group users groups" +#: rhodecode/controllers/admin/repos_groups.py:318 +#, fuzzy +msgid "An error occurred during deletion of group user groups" msgstr "Ocorreu um erro ao excluir o grupo do grupo de usuários" -#: rhodecode/controllers/admin/settings.py:124 +#: rhodecode/controllers/admin/settings.py:126 #, fuzzy, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositórios varridos com sucesso adicionados: %s, removidos: %s" -#: rhodecode/controllers/admin/settings.py:133 +#: rhodecode/controllers/admin/settings.py:135 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" -#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:166 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:170 #: rhodecode/controllers/admin/settings.py:301 -msgid "error occurred during updating application settings" +#, fuzzy +msgid "Error occurred during updating application settings" msgstr "ocorreu um erro ao atualizar as configurações da aplicação" -#: rhodecode/controllers/admin/settings.py:209 +#: rhodecode/controllers/admin/settings.py:216 #, fuzzy msgid "Updated visualisation settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:214 -#, fuzzy -msgid "error occurred during updating visualisation settings" +#: rhodecode/controllers/admin/settings.py:221 +#, fuzzy +msgid "Error occurred during updating visualisation settings" msgstr "ocorreu um erro ao atualizar as configurações da aplicação" #: rhodecode/controllers/admin/settings.py:297 @@ -628,35 +693,36 @@ msgstr "Atualizados os ganchos" #: rhodecode/controllers/admin/settings.py:327 -msgid "error occurred during hook creation" +#, fuzzy +msgid "Error occurred during hook creation" msgstr "ocorreu um erro ao criar gancho" #: rhodecode/controllers/admin/settings.py:346 msgid "Email task created" msgstr "Tarefa de e-mail criada" -#: rhodecode/controllers/admin/settings.py:408 +#: rhodecode/controllers/admin/settings.py:410 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:448 +#: rhodecode/controllers/admin/settings.py:452 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: rhodecode/controllers/admin/settings.py:463 +#: rhodecode/controllers/admin/settings.py:467 #: rhodecode/controllers/admin/users.py:198 -#, python-format -msgid "error occurred during update of user %s" +#, fuzzy, python-format +msgid "Error occurred during update of user %s" msgstr "ocorreu um erro ao atualizar o usuário %s" #: rhodecode/controllers/admin/users.py:130 -#, python-format -msgid "created user %s" +#, fuzzy, python-format +msgid "Created user %s" msgstr "usuário %s criado" #: rhodecode/controllers/admin/users.py:142 -#, python-format -msgid "error occurred during creation of user %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user %s" msgstr "ocorreu um erro ao criar o usuário %s" #: rhodecode/controllers/admin/users.py:176 @@ -664,7 +730,8 @@ msgstr "Usuário atualizado com sucesso" #: rhodecode/controllers/admin/users.py:214 -msgid "successfully deleted user" +#, fuzzy +msgid "Successfully deleted user" msgstr "usuário excluído com sucesso" #: rhodecode/controllers/admin/users.py:219 @@ -694,7 +761,7 @@ msgstr "Revogada permissão de 'criar repositório' ao usuário" #: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:279 +#: rhodecode/controllers/admin/users_groups.py:281 #, fuzzy msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante essa operação" @@ -730,236 +797,238 @@ msgstr "removido grupo de repositórios %s" #: rhodecode/controllers/admin/users_groups.py:86 -#, python-format -msgid "created users group %s" +#, fuzzy, python-format +msgid "Created user group %s" msgstr "criado grupo de usuários %s" #: rhodecode/controllers/admin/users_groups.py:97 -#, python-format -msgid "error occurred during creation of users group %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user group %s" msgstr "ocorreu um erro ao criar o grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:164 -#, python-format -msgid "updated users group %s" +#: rhodecode/controllers/admin/users_groups.py:166 +#, fuzzy, python-format +msgid "Updated user group %s" msgstr "grupo de usuários %s atualizado" -#: rhodecode/controllers/admin/users_groups.py:186 -#, python-format -msgid "error occurred during update of users group %s" +#: rhodecode/controllers/admin/users_groups.py:188 +#, fuzzy, python-format +msgid "Error occurred during update of user group %s" msgstr "ocorreu um erro ao atualizar o grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:203 -msgid "successfully deleted users group" +#: rhodecode/controllers/admin/users_groups.py:205 +#, fuzzy +msgid "Successfully deleted user group" msgstr "grupo de usuários excluído com sucesso" -#: rhodecode/controllers/admin/users_groups.py:208 -msgid "An error occurred during deletion of users group" +#: rhodecode/controllers/admin/users_groups.py:210 +#, fuzzy +msgid "An error occurred during deletion of user group" msgstr "Ocorreu um erro ao excluir o grupo de usuários" -#: rhodecode/controllers/admin/users_groups.py:257 -#, fuzzy -msgid "Granted 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:259 +#, fuzzy +msgid "Granted 'repository create' permission to user group" msgstr "Concedida permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users_groups.py:262 -#, fuzzy -msgid "Revoked 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:264 +#, fuzzy +msgid "Revoked 'repository create' permission to user group" msgstr "Revogada permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users_groups.py:268 -#, fuzzy -msgid "Granted 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:270 +#, fuzzy +msgid "Granted 'repository fork' permission to user group" msgstr "Concedida permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users_groups.py:273 -#, fuzzy -msgid "Revoked 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:275 +#, fuzzy +msgid "Revoked 'repository fork' permission to user group" msgstr "Revogada permissão de 'criar repositório' ao usuário" -#: rhodecode/lib/auth.py:509 +#: rhodecode/lib/auth.py:530 #, fuzzy, python-format msgid "IP %s not allowed" msgstr "seguidores" -#: rhodecode/lib/auth.py:558 +#: rhodecode/lib/auth.py:579 msgid "You need to be a registered user to perform this action" msgstr "Você precisa ser um usuário registrado para realizar essa ação" -#: rhodecode/lib/auth.py:599 +#: rhodecode/lib/auth.py:620 msgid "You need to be a signed in to view this page" msgstr "Você precisa estar logado para ver essa página" -#: rhodecode/lib/diffs.py:74 -msgid "binary file" +#: rhodecode/lib/diffs.py:66 +#, fuzzy +msgid "Binary file" msgstr "arquivo binário" -#: rhodecode/lib/diffs.py:90 +#: rhodecode/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Conjunto de mudanças é grande demais e foi cortado, use o menu de " "diferenças para ver as diferenças" -#: rhodecode/lib/diffs.py:100 +#: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: rhodecode/lib/helpers.py:374 +#: rhodecode/lib/helpers.py:394 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:506 msgid "True" msgstr "Verdadeiro" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:509 msgid "False" msgstr "Falso" -#: rhodecode/lib/helpers.py:530 +#: rhodecode/lib/helpers.py:547 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "excluído o repositório %s" -#: rhodecode/lib/helpers.py:533 +#: rhodecode/lib/helpers.py:550 #, fuzzy, python-format msgid "Created tag: %s" msgstr "usuário %s criado" -#: rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:563 msgid "Changeset not found" msgstr "Conjunto de alterações não encontrado" -#: rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:621 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:641 msgid "and" msgstr "e" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:642 #, python-format msgid "%s more" msgstr "%s mais" -#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 msgid "revisions" msgstr "revisões" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:667 #, fuzzy, python-format msgid "fork name %s" msgstr "nome da bifurcação" -#: rhodecode/lib/helpers.py:658 -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/lib/helpers.py:684 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:690 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 +#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:694 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 +#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 +#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/helpers.py:674 +#: rhodecode/lib/helpers.py:700 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/helpers.py:682 +#: rhodecode/lib/helpers.py:708 #, fuzzy msgid "[created] user" msgstr "usuário %s criado" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:710 #, fuzzy msgid "[updated] user" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:686 -#, fuzzy -msgid "[created] users group" +#: rhodecode/lib/helpers.py:712 +#, fuzzy +msgid "[created] user group" msgstr "criado grupo de usuários %s" -#: rhodecode/lib/helpers.py:688 -#, fuzzy -msgid "[updated] users group" +#: rhodecode/lib/helpers.py:714 +#, fuzzy +msgid "[updated] user group" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:716 #, fuzzy msgid "[commented] on revision in repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:692 +#: rhodecode/lib/helpers.py:718 #, fuzzy msgid "[commented] on pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:720 #, fuzzy msgid "[closed] pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:696 +#: rhodecode/lib/helpers.py:722 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/helpers.py:698 +#: rhodecode/lib/helpers.py:724 #, fuzzy msgid "[committed via RhodeCode] into repository" msgstr "[realizado commit via RhodeCode] para" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:726 #, fuzzy msgid "[pulled from remote] into repository" msgstr "[realizado pull remoto] para" -#: rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:728 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:730 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:732 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/helpers.py:884 +#: rhodecode/lib/helpers.py:910 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:888 +#: rhodecode/lib/helpers.py:914 msgid "No Files" msgstr "Nenhum Arquivo" -#: rhodecode/lib/helpers.py:1164 +#: rhodecode/lib/helpers.py:1198 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -970,200 +1039,245 @@ "renomeado a partir do sistema de arquivos. Por favor execute a aplicação " "outra vez para varrer novamente por repositórios" -#: rhodecode/lib/utils2.py:403 +#: rhodecode/lib/unionrepo.py:193 +#, fuzzy +msgid "cannot create new union repository" +msgstr "repositório [criado]" + +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: rhodecode/lib/utils2.py:404 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: rhodecode/lib/utils2.py:405 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: rhodecode/lib/utils2.py:406 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: rhodecode/lib/utils2.py:407 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: rhodecode/lib/utils2.py:408 +#: rhodecode/lib/utils2.py:416 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: rhodecode/lib/utils2.py:424 +#: rhodecode/lib/utils2.py:432 #, fuzzy, python-format msgid "in %s" msgstr "na linha %s" -#: rhodecode/lib/utils2.py:426 +#: rhodecode/lib/utils2.py:434 #, python-format msgid "%s ago" msgstr "%s atrás" -#: rhodecode/lib/utils2.py:428 +#: rhodecode/lib/utils2.py:436 #, fuzzy, python-format msgid "in %s and %s" msgstr "%s e %s atrás" -#: rhodecode/lib/utils2.py:431 +#: rhodecode/lib/utils2.py:439 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:442 msgid "just now" msgstr "agora há pouco" -#: rhodecode/lib/celerylib/tasks.py:270 -msgid "password reset link" -msgstr "link de reinicialização de senha" - #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 #, fuzzy msgid "Repository no access" msgstr "repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 #, fuzzy msgid "Repository read access" msgstr "Esse repositório já existe" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 #, fuzzy msgid "Repository write access" msgstr "repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 #, fuzzy msgid "Repository admin access" msgstr "repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 #, fuzzy msgid "Repositories Group no access" msgstr "grupos de repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 #, fuzzy msgid "Repositories Group read access" msgstr "grupos de repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 #, fuzzy msgid "Repositories Group write access" msgstr "grupos de repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 #, fuzzy msgid "Repositories Group admin access" msgstr "grupos de repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 #, fuzzy msgid "RhodeCode Administrator" msgstr "Administração de usuários" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 #, fuzzy msgid "Repository creation disabled" msgstr "Criação de repositório" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 #, fuzzy msgid "Repository creation enabled" msgstr "Criação de repositório" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 #, fuzzy msgid "Repository forking disabled" msgstr "Criação de repositório" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 #, fuzzy msgid "Repository forking enabled" msgstr "Criação de repositório" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 #, fuzzy msgid "Register disabled" msgstr "desabilitado" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 msgid "Not Reviewed" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 #, fuzzy msgid "Approved" msgstr "removidos" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 msgid "Rejected" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 msgid "Under Review" msgstr "" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "na linha %s" -#: rhodecode/model/comment.py:176 +#: rhodecode/model/comment.py:219 msgid "[Mention]" msgstr "[Menção]" +#: rhodecode/model/db.py:1252 +msgid "top level" +msgstr "" + +#: rhodecode/model/db.py:1393 +#, fuzzy +msgid "Repository group no access" +msgstr "grupos de repositórios" + +#: rhodecode/model/db.py:1394 +#, fuzzy +msgid "Repository group read access" +msgstr "grupos de repositórios" + +#: rhodecode/model/db.py:1395 +#, fuzzy +msgid "Repository group write access" +msgstr "grupos de repositórios" + +#: rhodecode/model/db.py:1396 +#, fuzzy +msgid "Repository group admin access" +msgstr "grupos de repositórios" + #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "Por favor entre um login" @@ -1182,63 +1296,64 @@ msgid "Enter %(min)i characters or more" msgstr "Entre com %(min)i caracteres ou mais" -#: rhodecode/model/notification.py:220 -#, fuzzy, python-format -msgid "commented on commit at %(when)s" -msgstr "comentado no commit" - -#: rhodecode/model/notification.py:221 -#, fuzzy, python-format -msgid "sent message at %(when)s" -msgstr "mensagem enviada" - -#: rhodecode/model/notification.py:222 -#, fuzzy, python-format -msgid "mentioned you at %(when)s" -msgstr "mencionou você" - -#: rhodecode/model/notification.py:223 -#, fuzzy, python-format -msgid "registered in RhodeCode at %(when)s" -msgstr "registrado no RhodeCode" - #: rhodecode/model/notification.py:224 #, fuzzy, python-format -msgid "opened new pull request at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "comentado no commit" #: rhodecode/model/notification.py:225 #, fuzzy, python-format -msgid "commented on pull request at %(when)s" +msgid "%(user)s sent message at %(when)s" +msgstr "mensagem enviada" + +#: rhodecode/model/notification.py:226 +#, fuzzy, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "mencionou você" + +#: rhodecode/model/notification.py:227 +#, fuzzy, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "registrado no RhodeCode" + +#: rhodecode/model/notification.py:228 +#, fuzzy, python-format +msgid "%(user)s opened new pull request at %(when)s" msgstr "comentado no commit" -#: rhodecode/model/pull_request.py:100 +#: rhodecode/model/notification.py:229 +#, fuzzy, python-format +msgid "%(user)s commented on pull request at %(when)s" +msgstr "comentado no commit" + +#: rhodecode/model/pull_request.py:104 #, python-format -msgid "%(user)s wants you to review pull request #%(pr_id)s" +msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: rhodecode/model/scm.py:556 +#: rhodecode/model/scm.py:598 #, fuzzy msgid "latest tip" msgstr "último login" -#: rhodecode/model/user.py:231 -msgid "new user registration" +#: rhodecode/model/user.py:232 +#, fuzzy +msgid "New user registration" msgstr "registro de novo usuário" -#: rhodecode/model/user.py:256 rhodecode/model/user.py:280 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 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:302 +#: rhodecode/model/user.py:303 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:308 +#: rhodecode/model/user.py:309 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1247,21 +1362,36 @@ "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38 +#: rhodecode/model/user.py:334 +#, fuzzy +msgid "Password reset link" +msgstr "link de reinicialização de senha" + +#: rhodecode/model/user.py:366 +#, fuzzy +msgid "Your new password" +msgstr "Nova senha" + +#: rhodecode/model/user.py:367 +#, python-format +msgid "Your new RhodeCode password:%s" +msgstr "" + +#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "Esse nome de usuário já existe" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:88 +#: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" @@ -1269,127 +1399,134 @@ "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, " "pontos e hífens e deve iniciar com caractere alfanumérico" -#: rhodecode/model/validators.py:116 +#: rhodecode/model/validators.py:117 #, fuzzy, python-format 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:135 -#, fuzzy -msgid "Invalid users group name" +#: rhodecode/model/validators.py:136 +#, fuzzy +msgid "Invalid user group name" msgstr "nome de usuário inválido" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 #, fuzzy, python-format -msgid "Users group \"%(usersgroup)s\" already exists" +msgid "User group \"%(usergroup)s\" already exists" msgstr "Esse grupo de usuários já existe" -#: rhodecode/model/validators.py:138 +#: rhodecode/model/validators.py:139 +#, fuzzy msgid "" -"users group name may only contain alphanumeric characters underscores, " +"user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" "Nome de grupo de repositório pode conter somente caracteres " "alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere " "alfanumérico" -#: rhodecode/model/validators.py:176 +#: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" msgstr "Não é possível associar esse grupo como progenitor" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, fuzzy, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Esse nome de usuário já existe" -#: rhodecode/model/validators.py:179 +#: rhodecode/model/validators.py:180 #, fuzzy, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Já existe um repositório com esse nome" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:238 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "Caracteres inválidos na senha" -#: rhodecode/model/validators.py:252 +#: rhodecode/model/validators.py:253 msgid "Passwords do not match" msgstr "Senhas não conferem" -#: rhodecode/model/validators.py:269 -msgid "invalid password" -msgstr "senha inválida" - #: rhodecode/model/validators.py:270 -msgid "invalid user name" -msgstr "nome de usuário inválido" +msgid "invalid password" +msgstr "senha inválida" #: rhodecode/model/validators.py:271 +msgid "invalid user name" +msgstr "nome de usuário inválido" + +#: rhodecode/model/validators.py:272 msgid "Your account is disabled" msgstr "Sua conta está desabilitada" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, fuzzy, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Esse nome de repositório não é permitido" -#: rhodecode/model/validators.py:317 +#: rhodecode/model/validators.py:318 #, fuzzy, python-format msgid "Repository named %(repo)s already exists" msgstr "Já existe um repositório com esse nome" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Esse repositório já existe em um grupo \"%s\"" -#: rhodecode/model/validators.py:320 +#: rhodecode/model/validators.py:321 #, fuzzy, python-format -msgid "Repositories group with name \"%(repo)s\" already exists" +msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Já existe um repositório com esse nome" -#: rhodecode/model/validators.py:433 +#: rhodecode/model/validators.py:438 msgid "invalid clone url" msgstr "URL de clonagem inválida" -#: rhodecode/model/validators.py:434 +#: rhodecode/model/validators.py:439 #, fuzzy msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s" -#: rhodecode/model/validators.py:459 +#: rhodecode/model/validators.py:464 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "Bifurcação precisa ser do mesmo tipo que o original" -#: rhodecode/model/validators.py:474 +#: rhodecode/model/validators.py:479 #, fuzzy msgid "You don't have permissions to create repository in this group" msgstr "Você não tem permissão para ver esta página" -#: rhodecode/model/validators.py:501 +#: rhodecode/model/validators.py:481 +#, fuzzy +msgid "no permission to create repository in root location" +msgstr "Você não tem permissão para ver esta página" + +#: rhodecode/model/validators.py:518 #, fuzzy msgid "You don't have permissions to create a group in this location" msgstr "Você não tem permissão para ver esta página" -#: rhodecode/model/validators.py:540 -msgid "This username or users group name is not valid" +#: rhodecode/model/validators.py:557 +#, fuzzy +msgid "This username or user group name is not valid" msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido" -#: rhodecode/model/validators.py:636 +#: rhodecode/model/validators.py:650 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: rhodecode/model/validators.py:651 +#: rhodecode/model/validators.py:665 msgid "This e-mail address is already taken" msgstr "Esse endereço de e-mail já está tomado" -#: rhodecode/model/validators.py:671 +#: rhodecode/model/validators.py:685 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "Esse endereço de e-mail não existe." -#: rhodecode/model/validators.py:708 +#: rhodecode/model/validators.py:722 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1397,21 +1534,25 @@ "O atributo de login LDAP do CN deve ser especificado - isto é o nome do " "atributo que é equivalente ao 'nome de usuário'" -#: rhodecode/model/validators.py:727 +#: rhodecode/model/validators.py:735 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:759 +#: rhodecode/model/validators.py:767 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:760 +#: rhodecode/model/validators.py:768 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/templates/index.html:3 +#: rhodecode/model/validators.py:800 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "Painel de Controle" @@ -1420,223 +1561,229 @@ #: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/bookmarks/bookmarks.html:9 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:9 -#: rhodecode/templates/journal/journal.html:49 -#: rhodecode/templates/journal/journal.html:50 -#: rhodecode/templates/tags/tags.html:10 +#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:47 +#: rhodecode/templates/tags/tags.html:9 msgid "quick filter..." msgstr "filtro rápido..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:239 msgid "repositories" msgstr "repositórios" -#: rhodecode/templates/index_base.html:14 -#: rhodecode/templates/index_base.html:17 +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 #: rhodecode/templates/admin/repos/repos.html:21 msgid "Add repository" msgstr "Adicionar repositório" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/index_base.html:20 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 +#, fuzzy +msgid "Add group" +msgstr "editar grupo de repositórios" + +#: rhodecode/templates/index_base.html:27 #, fuzzy msgid "Edit group" msgstr "editar grupo de repositórios" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:36 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "Group name" msgstr "Nome do grupo" -#: rhodecode/templates/index_base.html:37 -#: rhodecode/templates/index_base.html:79 +#: rhodecode/templates/index_base.html:41 +#: rhodecode/templates/index_base.html:83 #: rhodecode/templates/index_base.html:142 #: rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:270 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:73 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/forks/fork.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "Descrição" -#: rhodecode/templates/index_base.html:47 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 -msgid "Repositories group" +#: rhodecode/templates/index_base.html:51 +#: rhodecode/templates/admin/permissions/permissions.html:55 +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 +#: rhodecode/templates/forks/fork.html:47 +msgid "Repository group" msgstr "Grupo de repositórios" -#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:82 #: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:271 -#: rhodecode/templates/admin/permissions/permissions.html:117 +#: rhodecode/templates/index_base.html:268 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:71 -#: rhodecode/templates/admin/users/user_edit.html:200 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:211 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 -#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/admin/users/user_edit_my_account.html:172 +#: rhodecode/templates/base/perms_summary.html:14 +#: rhodecode/templates/bookmarks/bookmarks.html:34 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:201 -#: rhodecode/templates/journal/journal.html:305 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:132 -#: rhodecode/templates/tags/tags.html:51 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/summary/summary.html:55 +#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/tags/tags.html:48 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "Nome" -#: rhodecode/templates/index_base.html:80 +#: rhodecode/templates/index_base.html:84 msgid "Last change" msgstr "Última alteração" -#: rhodecode/templates/index_base.html:81 +#: rhodecode/templates/index_base.html:85 #: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:276 +#: rhodecode/templates/index_base.html:273 #: rhodecode/templates/admin/repos/repos.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:213 -#: rhodecode/templates/journal/journal.html:203 -#: rhodecode/templates/journal/journal.html:307 +#: rhodecode/templates/admin/users/user_edit_my_account.html:174 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:298 msgid "Tip" msgstr "Ponta" -#: rhodecode/templates/index_base.html:82 +#: rhodecode/templates/index_base.html:86 #: rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:278 +#: rhodecode/templates/index_base.html:275 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "Dono" -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "RSS" - -#: rhodecode/templates/index_base.html:84 +#: rhodecode/templates/index_base.html:87 msgid "Atom" msgstr "Atom" #: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:296 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:235 +#: rhodecode/templates/admin/users/user_edit_my_account.html:196 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:225 -#: rhodecode/templates/journal/journal.html:329 -#: rhodecode/templates/tags/tags.html:77 +#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/branches/branches.html:73 +#: rhodecode/templates/journal/journal.html:217 +#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "Clique para ordenar em ordem crescente" #: rhodecode/templates/index_base.html:172 -#: rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:301 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:297 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:236 +#: rhodecode/templates/admin/users/user_edit_my_account.html:197 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:226 -#: rhodecode/templates/journal/journal.html:330 -#: rhodecode/templates/tags/tags.html:78 +#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/branches/branches.html:74 +#: rhodecode/templates/journal/journal.html:218 +#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "Clique para ordenar em ordem descrescente" #: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:274 +#: rhodecode/templates/index_base.html:271 msgid "Last Change" msgstr "Última Alteração" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:302 +#: rhodecode/templates/index_base.html:211 #: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:237 +#: rhodecode/templates/admin/users/user_edit_my_account.html:198 #: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:227 -#: rhodecode/templates/journal/journal.html:331 -#: rhodecode/templates/tags/tags.html:79 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:219 +#: rhodecode/templates/journal/journal.html:322 +#: rhodecode/templates/tags/tags.html:76 msgid "No records found." msgstr "Nenhum registro encontrado." -#: rhodecode/templates/index_base.html:214 -#: rhodecode/templates/index_base.html:303 +#: rhodecode/templates/index_base.html:212 +#: rhodecode/templates/index_base.html:299 #: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:238 +#: rhodecode/templates/admin/users/user_edit_my_account.html:199 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:228 -#: rhodecode/templates/journal/journal.html:332 -#: rhodecode/templates/tags/tags.html:80 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:220 +#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "Erro de dados." -#: rhodecode/templates/index_base.html:215 -#: rhodecode/templates/index_base.html:304 +#: rhodecode/templates/index_base.html:213 +#: rhodecode/templates/index_base.html:300 #: rhodecode/templates/admin/repos/repos.html:101 -#: rhodecode/templates/admin/users/user_edit_my_account.html:105 -#: rhodecode/templates/admin/users/user_edit_my_account.html:239 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +#: rhodecode/templates/admin/users/user_edit_my_account.html:200 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:229 -#: rhodecode/templates/journal/journal.html:333 -#: rhodecode/templates/tags/tags.html:81 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:221 +#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "Carregando..." -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 -msgid "Sign In" +#: rhodecode/templates/index_base.html:298 +#, fuzzy +msgid "No repositories found." +msgstr "grupos de repositórios" + +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +msgid "Log In" msgstr "Entrar" #: rhodecode/templates/login.html:21 -msgid "Sign In to" -msgstr "Entrar em" +#, python-format +msgid "Log In to %s" +msgstr "" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:54 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:89 -#: rhodecode/templates/summary/summary.html:131 +#: rhodecode/templates/admin/users/user_edit.html:57 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 +#: rhodecode/templates/admin/users/users.html:77 +#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "Nome de usuário" #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:98 +#: rhodecode/templates/base/base.html:212 msgid "Password" msgstr "Senha" @@ -1644,17 +1791,22 @@ msgid "Remember me" msgstr "Lembre-se de mim" +#: rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "Entrar" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "Esqueceu sua senha ?" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 msgid "Don't have an account ?" msgstr "Não possui uma conta ?" #: rhodecode/templates/password_reset.html:5 -msgid "Reset your password" -msgstr "Reinicializar sua senha" +#, fuzzy +msgid "Password Reset" +msgstr "link de reinicialização de senha" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1688,23 +1840,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57 +#: rhodecode/templates/admin/users/user_edit.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "First Name" msgstr "Primeiro Nome" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:103 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66 +#: rhodecode/templates/admin/users/user_edit.html:106 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 msgid "Last Name" msgstr "Último Nome" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75 -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/admin/users/user_edit.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/summary/summary.html:125 msgid "Email" msgstr "E-mail" @@ -1716,44 +1868,31 @@ msgid "Your account must wait for activation by administrator" msgstr "Sua conta precisa esperar ativação por um administrador" -#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:76 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/summary/summary.html:77 msgid "Private repository" msgstr "Repositório privado" -#: rhodecode/templates/repo_switcher_list.html:16 +#: rhodecode/templates/repo_switcher_list.html:12 +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/summary/summary.html:79 msgid "Public repository" msgstr "Repositório público" -#: rhodecode/templates/switch_to_list.html:3 -#: rhodecode/templates/branches/branches.html:14 -msgid "branches" -msgstr "ramos" - #: rhodecode/templates/switch_to_list.html:10 #: rhodecode/templates/branches/branches_data.html:57 msgid "There are no branches yet" msgstr "Ainda não há ramos" -#: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:15 -msgid "tags" -msgstr "etiquetas" - #: rhodecode/templates/switch_to_list.html:22 #: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "Ainda não há etiquetas" -#: rhodecode/templates/switch_to_list.html:28 -#: rhodecode/templates/bookmarks/bookmarks.html:15 -msgid "bookmarks" -msgstr "marcadores" - #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 msgid "There are no bookmarks yet" @@ -1761,6 +1900,7 @@ #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/base/base.html:68 msgid "Admin journal" msgstr "Diário do administrador" @@ -1785,9 +1925,12 @@ #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account.html:215 -#: rhodecode/templates/journal/journal.html:205 -#: rhodecode/templates/journal/journal.html:309 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:87 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:300 msgid "Action" msgstr "Ação" @@ -1797,11 +1940,11 @@ msgstr "Repositório" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/tags/tags.html:52 +#: rhodecode/templates/tags/tags.html:49 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "Data" @@ -1821,6 +1964,7 @@ msgstr "grupos de repositórios" #: rhodecode/templates/admin/defaults/defaults.html:11 +#: rhodecode/templates/base/base.html:75 #, fuzzy msgid "Defaults" msgstr "excluir" @@ -1834,8 +1978,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 +#: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1865,7 +2008,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 #, fuzzy msgid "Enable locking" msgstr "habilitar" @@ -1878,14 +2021,17 @@ #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 #: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:148 +#: rhodecode/templates/admin/repos/repo_edit.html:173 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:137 -#: rhodecode/templates/admin/users/user_edit.html:182 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users/user_edit.html:140 +#: rhodecode/templates/admin/users/user_edit.html:185 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "Salvar" @@ -1894,8 +2040,11 @@ msgstr "Administração de LDAP" #: rhodecode/templates/admin/ldap/ldap.html:11 -msgid "Ldap" -msgstr "LDAP" +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:74 +#, fuzzy +msgid "LDAP" +msgstr "ldap" #: rhodecode/templates/admin/ldap/ldap.html:28 msgid "Connection settings" @@ -1976,8 +2125,7 @@ msgstr "commits" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 msgid "Pull requests" msgstr "" @@ -1995,6 +2143,7 @@ msgstr "Mostrar notificação" #: rhodecode/templates/admin/notifications/show_notification.html:9 +#: rhodecode/templates/base/base.html:241 msgid "Notifications" msgstr "Notificações" @@ -2003,11 +2152,12 @@ msgstr "Administração de permissões" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63 -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:165 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/users/user_edit.html:150 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:86 +#: rhodecode/templates/base/base.html:73 msgid "Permissions" msgstr "Permissões" @@ -2020,8 +2170,9 @@ msgstr "Acesso anônimo" #: rhodecode/templates/admin/permissions/permissions.html:49 +#, fuzzy msgid "" -"All default permissions on each repository will be reset to choosen " +"All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" @@ -2031,24 +2182,16 @@ #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -msgid "overwrite existing settings" +#, fuzzy +msgid "Overwrite existing settings" msgstr "sobrescrever configurações existentes" -#: rhodecode/templates/admin/permissions/permissions.html:55 -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" -msgstr "Grupo de repositórios" - #: rhodecode/templates/admin/permissions/permissions.html:62 #, fuzzy msgid "" -"All default permissions on each repository group will be reset to choosen" -" permission, note that all custom default permission on repositories " -"group will be lost" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" msgstr "" "Todas as permissões padrão em cada repositório serão reinicializadas para" " as permissões escolhidas. Note que todas as permissões padrão " @@ -2068,22 +2211,23 @@ msgstr "Criação de repositório" #: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:209 -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:179 -#: rhodecode/templates/admin/settings/settings.html:269 -#: rhodecode/templates/admin/users/user_edit.html:138 -#: rhodecode/templates/admin/users/user_edit.html:183 -#: rhodecode/templates/admin/users/user_edit.html:286 -#: rhodecode/templates/admin/users/user_edit.html:334 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84 +#: rhodecode/templates/admin/permissions/permissions.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:149 +#: rhodecode/templates/admin/repos/repo_edit.html:174 +#: rhodecode/templates/admin/repos/repo_edit.html:388 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:278 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users/user_edit.html:283 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:95 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:110 msgid "Reset" msgstr "Limpar" @@ -2092,109 +2236,74 @@ msgid "Default User Permissions" msgstr "Permissões padrão" -#: rhodecode/templates/admin/permissions/permissions.html:111 -#: rhodecode/templates/admin/users/user_edit.html:194 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -#, fuzzy -msgid "Nothing here yet" -msgstr "Ainda não há notificações aqui" - -#: rhodecode/templates/admin/permissions/permissions.html:118 -#: rhodecode/templates/admin/users/user_edit.html:201 -#: rhodecode/templates/admin/users/user_edit_my_account.html:61 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 -msgid "Permission" -msgstr "Permissão" - -#: rhodecode/templates/admin/permissions/permissions.html:119 -#: rhodecode/templates/admin/users/user_edit.html:202 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 -#, fuzzy -msgid "Edit Permission" -msgstr "Permissão de repositório" - -#: rhodecode/templates/admin/permissions/permissions.html:149 -#: rhodecode/templates/admin/permissions/permissions.html:151 -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:232 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:116 -#: rhodecode/templates/data_table/_dt_elements.html:117 -msgid "edit" -msgstr "editar" - -#: rhodecode/templates/admin/permissions/permissions.html:168 -#: rhodecode/templates/admin/users/user_edit.html:295 +#: rhodecode/templates/admin/permissions/permissions.html:113 +#: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy msgid "Allowed IP addresses" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/permissions/permissions.html:182 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 -#: rhodecode/templates/admin/users/user_edit.html:263 -#: rhodecode/templates/admin/users/user_edit.html:308 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/admin/permissions/permissions.html:127 +#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 +#: rhodecode/templates/admin/users/user_edit.html:212 +#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users_groups/users_groups.html:46 #: rhodecode/templates/data_table/_dt_elements.html:122 #: rhodecode/templates/data_table/_dt_elements.html:130 msgid "delete" msgstr "excluir" -#: rhodecode/templates/admin/permissions/permissions.html:183 -#: rhodecode/templates/admin/users/user_edit.html:309 +#: rhodecode/templates/admin/permissions/permissions.html:128 +#: rhodecode/templates/admin/users/user_edit.html:258 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "Confirma excluir este usuário: %s" -#: rhodecode/templates/admin/permissions/permissions.html:189 -#: rhodecode/templates/admin/users/user_edit.html:315 +#: rhodecode/templates/admin/permissions/permissions.html:134 +#: rhodecode/templates/admin/users/user_edit.html:264 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:200 -#: rhodecode/templates/admin/users/user_edit.html:326 +#: rhodecode/templates/admin/permissions/permissions.html:145 +#: rhodecode/templates/admin/users/user_edit.html:275 #, fuzzy msgid "New ip address" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/permissions/permissions.html:208 -#: rhodecode/templates/admin/users/user_edit.html:285 -#: rhodecode/templates/admin/users/user_edit.html:333 +#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:387 +#: rhodecode/templates/admin/users/user_edit.html:234 +#: rhodecode/templates/admin/users/user_edit.html:282 #, fuzzy msgid "Add" msgstr "adicionar" -#: rhodecode/templates/admin/repos/repo_add.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -#: rhodecode/templates/base/base.html:154 +#: rhodecode/templates/admin/repos/repo_add.html:12 +#: rhodecode/templates/admin/repos/repo_add.html:16 +#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 +#: rhodecode/templates/base/base.html:263 msgid "Repositories" msgstr "Repositórios" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +#: rhodecode/templates/admin/repos/repo_add.html:19 +#, fuzzy +msgid "Add new" msgstr "adicionar novo" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:104 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Clone from" msgstr "Clonar de" #: rhodecode/templates/admin/repos/repo_add_base.html:24 #: rhodecode/templates/admin/repos/repo_edit.html:44 -#: rhodecode/templates/settings/repo_settings.html:43 msgid "Optional http[s] url from which repository should be cloned." msgstr "URL opcional http[s] da qual o repositório deve ser clonado." #: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/forks/fork.html:54 +#: rhodecode/templates/forks/fork.html:51 #, fuzzy msgid "Optionaly select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." @@ -2205,47 +2314,42 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 -#: rhodecode/templates/forks/fork.html:41 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/forks/fork.html:38 #, fuzzy msgid "Landing revision" msgstr "próxima revisão" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 -#: rhodecode/templates/forks/fork.html:45 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 -#: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:70 +#: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Seja sucinto e objetivo. Use um arquivo README para descrições mais " "longas." -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -msgid "add" -msgstr "adicionar" - -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 -msgid "add new repository" -msgstr "adicionar novo repositório" - -#: rhodecode/templates/admin/repos/repo_edit.html:5 +#: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" msgstr "Editar repositório" +#: rhodecode/templates/admin/repos/repo_edit.html:12 +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:11 +#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/summary/summary.html:212 +msgid "Settings" +msgstr "Configurações" + #: rhodecode/templates/admin/repos/repo_edit.html:40 -#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "URI de clonagem" #: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 msgid "Optional select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." @@ -2253,97 +2357,99 @@ msgid "Change owner of this repository." msgstr "Mudar o dono desse repositório." -#: rhodecode/templates/admin/repos/repo_edit.html:152 -msgid "Administration" -msgstr "Administração" - -#: rhodecode/templates/admin/repos/repo_edit.html:155 +#: rhodecode/templates/admin/repos/repo_edit.html:184 +#, fuzzy +msgid "Advanced settings" +msgstr "Salvar configurações" + +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Statistics" msgstr "Estatísticas" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Reset current statistics" msgstr "Reinicializar estatísticas atuais" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Confirm to remove current statistics" msgstr "Confirma remover atuais estatísticas" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "Trazida à rev" -#: rhodecode/templates/admin/repos/repo_edit.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:195 msgid "Stats gathered" msgstr "Estatísticas coletadas" -#: rhodecode/templates/admin/repos/repo_edit.html:171 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Remote" msgstr "Remoto" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Pull changes from remote location" msgstr "Realizar pull de alterações a partir de localização remota" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Confirm to pull changes from remote side" msgstr "Confirma realizar pull de alterações a partir de lado remoto" -#: rhodecode/templates/admin/repos/repo_edit.html:186 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "Cache" msgstr "Cache" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Invalidate repository cache" msgstr "Invalidar cache do repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Confirm to invalidate repository cache" msgstr "Confirma invalidar cache do repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:193 +#: rhodecode/templates/admin/repos/repo_edit.html:225 msgid "" "Manually invalidate cache for this repository. On first access repository" " will be cached again" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:198 +#: rhodecode/templates/admin/repos/repo_edit.html:230 msgid "List of cached values" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:201 +#: rhodecode/templates/admin/repos/repo_edit.html:233 msgid "Prefix" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:202 +#: rhodecode/templates/admin/repos/repo_edit.html:234 #, fuzzy msgid "Key" msgstr "Chave de API" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:235 #: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:121 +#: rhodecode/templates/admin/users/user_edit.html:124 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_group_add.html:41 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +#: rhodecode/templates/admin/users_groups/users_groups.html:36 msgid "Active" msgstr "Ativo" -#: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:306 -#: rhodecode/templates/base/base.html:308 -#: rhodecode/templates/base/base.html:310 +#: rhodecode/templates/admin/repos/repo_edit.html:250 +#: rhodecode/templates/base/base.html:280 +#: rhodecode/templates/base/base.html:281 msgid "Public journal" msgstr "Diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "Remove from public journal" msgstr "Remover do diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:226 +#: rhodecode/templates/admin/repos/repo_edit.html:258 msgid "Add to public journal" msgstr "Adicionar ao diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:231 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" @@ -2351,80 +2457,125 @@ "Todas as ações feitas nesse repositório serão acessíveis a todos no " "diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:238 +#: rhodecode/templates/admin/repos/repo_edit.html:270 #, fuzzy msgid "Locking" msgstr "destravar" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 #, fuzzy msgid "Confirm to unlock repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 #, fuzzy msgid "Confirm to lock repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:247 +#: rhodecode/templates/admin/repos/repo_edit.html:279 #, fuzzy msgid "Repository is not locked" msgstr "repositórios" -#: rhodecode/templates/admin/repos/repo_edit.html:252 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:291 #, fuzzy msgid "Set as fork of" msgstr "Marcar como bifurcação" -#: rhodecode/templates/admin/repos/repo_edit.html:264 +#: rhodecode/templates/admin/repos/repo_edit.html:296 msgid "set" msgstr "ajustar" -#: rhodecode/templates/admin/repos/repo_edit.html:268 +#: rhodecode/templates/admin/repos/repo_edit.html:300 #, fuzzy 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" -#: rhodecode/templates/admin/repos/repo_edit.html:274 +#: rhodecode/templates/admin/repos/repo_edit.html:306 #: rhodecode/templates/changeset/changeset_file_comment.html:41 msgid "Delete" msgstr "Excluir" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Remove this repository" msgstr "Remover deste repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Confirm to delete this repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:282 -#: rhodecode/templates/settings/repo_settings.html:119 +#: rhodecode/templates/admin/repos/repo_edit.html:317 +#, fuzzy, python-format +msgid "this repository has %s fork" +msgid_plural "this repository has %s forks" +msgstr[0] "repositório [criado] como uma bifurcação" +msgstr[1] "" + +#: rhodecode/templates/admin/repos/repo_edit.html:318 +#, fuzzy +msgid "Detach forks" +msgstr "Marcar como bifurcação" + +#: rhodecode/templates/admin/repos/repo_edit.html:319 +#, fuzzy +msgid "Delete forks" +msgstr "excluir" + +#: rhodecode/templates/admin/repos/repo_edit.html:322 #, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need fully delete it " -"from file system please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" +" from file system please do it manually" msgstr "" "Este repositório será renomeado de uma maneira especial, de forma a ser " "inacessível ao RhodeCode e sistemas de controle de versão.\n" " Se você precisa exclui-lo completamente do " "sistema de arquivos, por favor faça-o manualmente" +#: rhodecode/templates/admin/repos/repo_edit.html:336 +msgid "Extra fields" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:348 +#, fuzzy, python-format +msgid "Confirm to delete this field: %s" +msgstr "Confirma excluir este usuário: %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:362 +#, fuzzy +msgid "New field key" +msgstr "adicionar novo arquivo" + +#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgid "New field label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:373 +msgid "Enter short label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:379 +#, fuzzy +msgid "New field description" +msgstr "Descrição" + +#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgid "Enter description of a field" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -2442,8 +2593,6 @@ #: 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:85 -#: rhodecode/templates/base/base.html:235 msgid "admin" msgstr "administrador" @@ -2453,75 +2602,60 @@ msgstr "membro" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 -#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "repositório privado" #: rhodecode/templates/admin/repos/repo_edit_perms.html:19 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 #, fuzzy msgid "default" msgstr "excluir" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 msgid "revoke" msgstr "revogar" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 msgid "Add another member" msgstr "Adicionar outro membro" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 msgid "Failed to remove user" msgstr "Falha ao reomver usuário" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 -msgid "Failed to remove users group" +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 +#, fuzzy +msgid "Failed to remove user group" msgstr "Falha ao remover grupo de usuários" #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "Administração de repositórios" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 msgid "apply to children" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" msgstr "" +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#, python-format +msgid "%s Group Dashboard" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 -#: rhodecode/templates/base/base.html:128 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 msgid "Home" msgstr "Início" @@ -2530,78 +2664,86 @@ msgstr "com" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repos group" -msgstr "Adicionar grupo de repositórios" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 -msgid "Repos groups" +#, fuzzy +msgid "Add repository group" msgstr "Grupo de repositórios" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 -msgid "add new repos group" +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 +#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 +#, fuzzy +msgid "Repository groups" +msgstr "Grupo de repositórios" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 +#, fuzzy +msgid "Add new repository group" msgstr "adicionar novo grupo de repositórios" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 msgid "Group parent" msgstr "Progenitor do grupo" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/users/user_add.html:94 -#: rhodecode/templates/admin/users_groups/users_group_add.html:49 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:149 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59 msgid "save" msgstr "salvar" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repos group" -msgstr "Editar grupo de repositórios" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 -msgid "edit repos group" +#, fuzzy +msgid "Edit repository group" +msgstr "editar grupo de repositórios" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 +#, fuzzy, python-format +msgid "Edit repository group %s" msgstr "editar grupo de repositórios" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26 -#, fuzzy -msgid "Add new child group" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 +#, fuzzy +msgid "Add child group" msgstr "Adicionar novo grupo de usuários" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repositories groups administration" +#, fuzzy +msgid "Repository groups administration" msgstr "Administração de grupos de repositórios" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -#, fuzzy -msgid "Add new group" -msgstr "Adicionar novo grupo de usuários" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" msgstr "Número de repositórios de nível superior" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "ação" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#, fuzzy +msgid "Edit" +msgstr "editar" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/base/perms_summary.html:29 +#: rhodecode/templates/base/perms_summary.html:48 +#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/data_table/_dt_elements.html:116 +#: rhodecode/templates/data_table/_dt_elements.html:117 +msgid "edit" +msgstr "editar" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 #, fuzzy, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "Confirma excluir este repositório" msgstr[1] "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68 -msgid "There are no repositories groups yet" +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 +#, fuzzy +msgid "There are no repository groups yet" msgstr "Ainda não há grupos de repositórios" #: rhodecode/templates/admin/settings/hooks.html:5 @@ -2609,12 +2751,6 @@ msgid "Settings administration" msgstr "Administração de configurações" -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:13 -msgid "Settings" -msgstr "Configurações" - #: rhodecode/templates/admin/settings/hooks.html:24 msgid "Built in hooks - read only" msgstr "Ganchos pré-definidos - somente leitura" @@ -2631,15 +2767,16 @@ msgid "Failed to remove hook" msgstr "Falha ao remover gancho" -#: rhodecode/templates/admin/settings/settings.html:24 +#: rhodecode/templates/admin/settings/settings.html:26 msgid "Remap and rescan repositories" msgstr "Remapear e varrer novamente repositórios" -#: rhodecode/templates/admin/settings/settings.html:32 -msgid "rescan option" +#: rhodecode/templates/admin/settings/settings.html:34 +#, fuzzy +msgid "Rescan option" msgstr "opção de varredura" -#: rhodecode/templates/admin/settings/settings.html:38 +#: rhodecode/templates/admin/settings/settings.html:40 msgid "" "In case a repository was deleted from filesystem and there are leftovers " "in the database check this option to scan obsolete data in database and " @@ -2649,163 +2786,172 @@ "restos no banco de dados, marque esta opção para varrer dados obsoletos " "no banco e removê-los." -#: rhodecode/templates/admin/settings/settings.html:39 -msgid "destroy old data" +#: rhodecode/templates/admin/settings/settings.html:41 +#, fuzzy +msgid "Destroy old data" msgstr "destruir dados antigos" -#: rhodecode/templates/admin/settings/settings.html:41 +#: rhodecode/templates/admin/settings/settings.html:43 msgid "" "Rescan repositories location for new repositories. Also deletes obsolete " "if `destroy` flag is checked " msgstr "" -#: rhodecode/templates/admin/settings/settings.html:46 +#: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" msgstr "Varrer repositórios" -#: rhodecode/templates/admin/settings/settings.html:52 +#: rhodecode/templates/admin/settings/settings.html:54 msgid "Whoosh indexing" msgstr "Indexação do Whoosh" -#: rhodecode/templates/admin/settings/settings.html:60 -msgid "index build option" +#: rhodecode/templates/admin/settings/settings.html:62 +#, fuzzy +msgid "Index build option" msgstr "opção de construção de índice" -#: rhodecode/templates/admin/settings/settings.html:65 -msgid "build from scratch" +#: rhodecode/templates/admin/settings/settings.html:67 +#, fuzzy +msgid "Build from scratch" msgstr "construir do início" -#: rhodecode/templates/admin/settings/settings.html:71 +#: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" msgstr "Reindexar" -#: rhodecode/templates/admin/settings/settings.html:77 +#: rhodecode/templates/admin/settings/settings.html:79 msgid "Global application settings" msgstr "Configurações globais da aplicação" -#: rhodecode/templates/admin/settings/settings.html:86 -msgid "Application name" -msgstr "Nome da aplicação" - -#: rhodecode/templates/admin/settings/settings.html:95 -msgid "Realm text" -msgstr "Texto de esfera" - -#: rhodecode/templates/admin/settings/settings.html:104 -msgid "GA code" -msgstr "Código GA" - -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/settings/settings.html:268 +#: rhodecode/templates/admin/settings/settings.html:88 +msgid "Site branding" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:97 +msgid "HTTP authentication realm" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:106 +msgid "Google Analytics code" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:114 +#: rhodecode/templates/admin/settings/settings.html:186 +#: rhodecode/templates/admin/settings/settings.html:277 msgid "Save settings" msgstr "Salvar configurações" -#: rhodecode/templates/admin/settings/settings.html:119 +#: rhodecode/templates/admin/settings/settings.html:121 #, fuzzy msgid "Visualisation settings" msgstr "Configurações globais da aplicação" -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:129 #, fuzzy msgid "General" msgstr "habilitar" -#: rhodecode/templates/admin/settings/settings.html:132 +#: rhodecode/templates/admin/settings/settings.html:134 msgid "Use lightweight dashboard" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:140 +#, fuzzy +msgid "Use repository extra fields" +msgstr "repositórios" + +#: rhodecode/templates/admin/settings/settings.html:147 #, fuzzy msgid "Icons" msgstr "Opções" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:156 #, fuzzy msgid "Show private repo icon on repositories" msgstr "repositório privado" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:163 #, fuzzy msgid "Meta-Tagging" msgstr "configurações" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:168 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:195 #, fuzzy msgid "VCS settings" msgstr "configurações" -#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:201 -#, fuzzy -msgid "require ssl for vcs operations" +#: rhodecode/templates/admin/settings/settings.html:209 +#, fuzzy +msgid "Require SSL for vcs operations" msgstr "exigir ssl para realizar push" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:217 msgid "Hooks" msgstr "Ganchos" -#: rhodecode/templates/admin/settings/settings.html:214 -msgid "Update repository after push (hg update)" -msgstr "Atualizar repositório após realizar push (hg update)" - -#: rhodecode/templates/admin/settings/settings.html:218 -msgid "Show repository size after push" -msgstr "Mostrar tamanho do repositório após o push" - #: rhodecode/templates/admin/settings/settings.html:222 +msgid "Update repository after push (hg update)" +msgstr "Atualizar repositório após realizar push (hg update)" + +#: rhodecode/templates/admin/settings/settings.html:226 +msgid "Show repository size after push" +msgstr "Mostrar tamanho do repositório após o push" + +#: rhodecode/templates/admin/settings/settings.html:230 msgid "Log user push commands" msgstr "Armazenar registro de comandos de push dos usuários" -#: rhodecode/templates/admin/settings/settings.html:226 +#: rhodecode/templates/admin/settings/settings.html:234 msgid "Log user pull commands" msgstr "Armazenar registro de comandos de pull dos usuários" -#: rhodecode/templates/admin/settings/settings.html:230 -msgid "advanced setup" +#: rhodecode/templates/admin/settings/settings.html:238 +#, fuzzy +msgid "Advanced setup" msgstr "confirguações avançadas" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:243 #, fuzzy msgid "Mercurial Extensions" msgstr "Repositório Mercurial" -#: rhodecode/templates/admin/settings/settings.html:240 -msgid "largefiles extensions" +#: rhodecode/templates/admin/settings/settings.html:248 +msgid "Enable largefiles extension" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:244 -msgid "hgsubversion extensions" +#: rhodecode/templates/admin/settings/settings.html:252 +msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:246 +#: rhodecode/templates/admin/settings/settings.html:254 msgid "" -"Requires hgsubversion library installed. Allows clonning from svn remote " +"Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:256 +#: rhodecode/templates/admin/settings/settings.html:264 msgid "Repositories location" msgstr "Localização dos repositórios" -#: rhodecode/templates/admin/settings/settings.html:261 +#: rhodecode/templates/admin/settings/settings.html:269 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " @@ -2815,36 +2961,38 @@ "certeza de que quer mudar isto, você precisa reiniciar a aplicação para " "que essa configuração tenha efeito. Clique este rótulo para destravar." -#: rhodecode/templates/admin/settings/settings.html:262 -#: rhodecode/templates/base/base.html:227 -msgid "unlock" +#: rhodecode/templates/admin/settings/settings.html:270 +#: rhodecode/templates/base/base.html:131 +#, fuzzy +msgid "Unlock" msgstr "destravar" -#: rhodecode/templates/admin/settings/settings.html:263 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:283 +#: rhodecode/templates/admin/settings/settings.html:292 msgid "Test Email" msgstr "Testar E-mail" -#: rhodecode/templates/admin/settings/settings.html:291 +#: rhodecode/templates/admin/settings/settings.html:300 msgid "Email to" msgstr "E-mail para" -#: rhodecode/templates/admin/settings/settings.html:299 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "Send" msgstr "Enviar" -#: rhodecode/templates/admin/settings/settings.html:305 +#: rhodecode/templates/admin/settings/settings.html:314 msgid "System Info and Packages" msgstr "Informações de Sistema e Pacotes" -#: rhodecode/templates/admin/settings/settings.html:308 -msgid "show" -msgstr "mostrar" +#: rhodecode/templates/admin/settings/settings.html:317 +#: rhodecode/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "Mostrar" #: rhodecode/templates/admin/users/user_add.html:5 msgid "Add user" @@ -2852,11 +3000,14 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 +#: rhodecode/templates/base/base.html:71 msgid "Users" msgstr "Usuários" #: rhodecode/templates/admin/users/user_add.html:12 -msgid "add new user" +#: rhodecode/templates/admin/users/users.html:23 +#, fuzzy +msgid "Add new user" msgstr "adicionar novo usuário" #: rhodecode/templates/admin/users/user_add.html:50 @@ -2867,6 +3018,12 @@ msgid "Edit user" msgstr "Editar usuário" +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#, fuzzy, python-format +msgid "Edit %s" +msgstr "editar" + #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 msgid "Change your avatar at" @@ -2882,31 +3039,32 @@ msgid "API key" msgstr "Chave de API" -#: rhodecode/templates/admin/users/user_edit.html:48 -msgid "Your IP" +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 +msgid "Current IP" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:67 +#: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" msgstr "DN LDAP" -#: rhodecode/templates/admin/users/user_edit.html:76 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39 +#: rhodecode/templates/admin/users/user_edit.html:79 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password" msgstr "Nova senha" -#: rhodecode/templates/admin/users/user_edit.html:85 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48 +#: rhodecode/templates/admin/users/user_edit.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "New password confirmation" msgstr "Confirmação de nova senha" -#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:158 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 #, fuzzy msgid "Inherit default permissions" msgstr "Permissões padrão" -#: rhodecode/templates/admin/users/user_edit.html:160 +#: rhodecode/templates/admin/users/user_edit.html:163 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2914,34 +3072,34 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:169 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "Criar repositórios" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:177 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 #, fuzzy msgid "Fork repositories" msgstr "repositórios" -#: rhodecode/templates/admin/users/user_edit.html:251 +#: rhodecode/templates/admin/users/user_edit.html:200 #, fuzzy msgid "Email addresses" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/users/user_edit.html:213 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "Confirma excluir este usuário: %s" -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/users/user_edit.html:227 #, fuzzy msgid "New email address" msgstr "Endereço de e-mail" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:130 +#: rhodecode/templates/base/base.html:242 msgid "My account" msgstr "Minha conta" @@ -2954,7 +3112,7 @@ msgstr "Minhas permissões" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:57 +#: rhodecode/templates/journal/journal.html:54 msgid "My repos" msgstr "Meus repositórios" @@ -2963,32 +3121,46 @@ msgid "My pull requests" msgstr "comentado no commit" -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/journal/journal.html:61 -#, fuzzy -msgid "Add repo" -msgstr "adicionar novo" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 +#, fuzzy +msgid "Show closed pull requests" +msgstr "repositório [criado]" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 #, python-format msgid "Pull request #%s opened on %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 +#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_show.html:27 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +msgid "Closed" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 #, fuzzy msgid "Confirm to delete this pull request" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 +#, fuzzy +msgid "Nothing here yet" +msgstr "Ainda não há notificações aqui" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "" @@ -2998,69 +3170,60 @@ msgstr "Administração de usuários" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:241 msgid "users" msgstr "usuários" -#: rhodecode/templates/admin/users/users.html:23 -#, fuzzy -msgid "Add new user" -msgstr "adicionar novo usuário" - -#: rhodecode/templates/admin/users/users.html:77 -msgid "username" -msgstr "nome de usuário" - #: rhodecode/templates/admin/users/users.html:80 #, fuzzy -msgid "firstname" +msgid "Firstname" msgstr "Primeiro Nome" #: rhodecode/templates/admin/users/users.html:81 -msgid "lastname" +#, fuzzy +msgid "Lastname" msgstr "sobrenome" #: rhodecode/templates/admin/users/users.html:82 -msgid "last login" +#, fuzzy +msgid "Last login" msgstr "último login" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" -msgstr "ativo" - -#: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:244 -msgid "ldap" -msgstr "ldap" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -msgid "Add users group" +#, fuzzy +msgid "Add user group" msgstr "Adicionar grupo de usuários" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -msgid "Users groups" -msgstr "Grupos de usuários" +#: rhodecode/templates/admin/users_groups/users_groups.html:11 +#: rhodecode/templates/base/base.html:72 +#, fuzzy +msgid "User groups" +msgstr "grupos de usuários" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -msgid "add new users group" +#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#, fuzzy +msgid "Add new user group" msgstr "Adicionar novo grupo de usuários" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit users group" +#, fuzzy +msgid "Edit user group" msgstr "Editar grupo de usuários" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -msgid "UsersGroups" -msgstr "Grupos de Usuários" +#, fuzzy +msgid "UserGroups" +msgstr "grupos de usuários" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "Members" msgstr "Membros" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -msgid "Choosen group members" +#, fuzzy +msgid "Chosen group members" msgstr "Membros escolhidos do grupo" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 @@ -3075,270 +3238,266 @@ msgid "Add all elements" msgstr "Adicionar todos os elementos" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 msgid "Group members" msgstr "Membros do grupo" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 #, fuzzy msgid "No members yet" msgstr "membros" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 -#, fuzzy -msgid "Permissions defined for this group" -msgstr "Administração de permissões" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 -#, fuzzy -msgid "No permissions set yet" -msgstr "Copiar permissões" - #: rhodecode/templates/admin/users_groups/users_groups.html:5 -msgid "Users groups administration" +#, fuzzy +msgid "User groups administration" msgstr "Administração de grupos de usuários" -#: rhodecode/templates/admin/users_groups/users_groups.html:23 -#, fuzzy -msgid "Add new user group" -msgstr "Adicionar novo grupo de usuários" - -#: rhodecode/templates/admin/users_groups/users_groups.html:32 -msgid "group name" -msgstr "nome do grupo" - -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -#: rhodecode/templates/base/root.html:46 -msgid "members" -msgstr "membros" - -#: rhodecode/templates/admin/users_groups/users_groups.html:45 -#, python-format -msgid "Confirm to delete this users group: %s" +#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#, fuzzy, python-format +msgid "Confirm to delete this user group: %s" msgstr "Confirme para excluir este grupo de usuários: %s" -#: rhodecode/templates/base/base.html:41 +#: rhodecode/templates/base/base.html:42 msgid "Submit a bug" msgstr "Encaminhe um bug" -#: rhodecode/templates/base/base.html:76 -#, fuzzy -msgid "Not logged in" -msgstr "último login" - -#: rhodecode/templates/base/base.html:83 -msgid "Login to your account" -msgstr "Entrar com sua conta" - -#: rhodecode/templates/base/base.html:106 -msgid "Forgot password ?" -msgstr "Esqueceu a senha ?" - -#: rhodecode/templates/base/base.html:113 -msgid "Log In" -msgstr "Entrar" - -#: rhodecode/templates/base/base.html:124 -msgid "Inbox" -msgstr "Caixa de Entrada" - -#: rhodecode/templates/base/base.html:129 -#: rhodecode/templates/base/base.html:297 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:301 -#: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/public_journal.html:4 -msgid "Journal" -msgstr "Diário" - -#: rhodecode/templates/base/base.html:131 -msgid "Log Out" -msgstr "Sair" - -#: rhodecode/templates/base/base.html:150 -msgid "Switch repository" -msgstr "Trocar repositório" - -#: rhodecode/templates/base/base.html:152 -msgid "Products" -msgstr "Produtos" - -#: rhodecode/templates/base/base.html:158 -#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47 -msgid "loading..." -msgstr "carregando..." - -#: rhodecode/templates/base/base.html:166 -#: rhodecode/templates/base/base.html:168 -#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/base/base.html:108 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 +#: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "Sumário" -#: rhodecode/templates/base/base.html:174 -#: rhodecode/templates/base/base.html:176 -#: rhodecode/templates/base/base.html:178 -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/base/base.html:109 +#: rhodecode/templates/changelog/changelog.html:11 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "Registro de alterações" -#: rhodecode/templates/base/base.html:182 -#: rhodecode/templates/base/base.html:184 -#: rhodecode/templates/base/base.html:186 -msgid "Switch to" -msgstr "Trocar para" - -#: rhodecode/templates/base/base.html:193 -#: rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:110 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:12 msgid "Files" msgstr "Arquivos" -#: rhodecode/templates/base/base.html:201 -#: rhodecode/templates/base/base.html:205 +#: rhodecode/templates/base/base.html:112 +#, fuzzy +msgid "Switch To" +msgstr "Trocar para" + +#: rhodecode/templates/base/base.html:114 +#: rhodecode/templates/base/base.html:267 +msgid "loading..." +msgstr "carregando..." + +#: rhodecode/templates/base/base.html:118 msgid "Options" msgstr "Opções" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/base/base.html:212 -#, fuzzy -msgid "repository settings" -msgstr "Criação de repositório" - -#: rhodecode/templates/base/base.html:216 +#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/forks/forks_data.html:21 +#, fuzzy +msgid "Compare fork" +msgstr "comparar exibir" + +#: rhodecode/templates/base/base.html:126 +msgid "Lightweight changelog" +msgstr "" + +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:54 +msgid "Search" +msgstr "Pesquisar" + +#: rhodecode/templates/base/base.html:133 +#, fuzzy +msgid "Lock" +msgstr "destravar" + +#: rhodecode/templates/base/base.html:141 +#, fuzzy +msgid "Follow" +msgstr "seguidores" + +#: rhodecode/templates/base/base.html:142 +#, fuzzy +msgid "Unfollow" +msgstr "seguidores" + +#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/forks/fork.html:13 -msgid "fork" -msgstr "bifurcação" - -#: rhodecode/templates/base/base.html:218 -#: rhodecode/templates/changelog/changelog.html:43 -#, fuzzy -msgid "open new pull request" +#: rhodecode/templates/forks/fork.html:9 +msgid "Fork" +msgstr "Bifurcação" + +#: rhodecode/templates/base/base.html:147 +#, fuzzy +msgid "Create Pull Request" msgstr "Criar novo arquivo" -#: rhodecode/templates/base/base.html:221 -#, fuzzy -msgid "compare fork" -msgstr "comparar exibir" - -#: rhodecode/templates/base/base.html:223 -msgid "search" -msgstr "pesquisar" - -#: rhodecode/templates/base/base.html:229 -#, fuzzy -msgid "lock" -msgstr "destravar" - -#: rhodecode/templates/base/base.html:240 -msgid "repositories groups" -msgstr "grupos de repositórios" - -#: rhodecode/templates/base/base.html:242 -msgid "users groups" -msgstr "grupos de usuários" +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Show Pull Requests" +msgstr "comentado no commit" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Pull Requests" +msgstr "comentado no commit" + +#: rhodecode/templates/base/base.html:190 +#, fuzzy +msgid "Not logged in" +msgstr "último login" + +#: rhodecode/templates/base/base.html:197 +msgid "Login to your account" +msgstr "Entrar com sua conta" + +#: rhodecode/templates/base/base.html:220 +msgid "Forgot password ?" +msgstr "Esqueceu a senha ?" #: rhodecode/templates/base/base.html:243 -msgid "permissions" -msgstr "permissões" - -#: rhodecode/templates/base/base.html:245 -#, fuzzy -msgid "defaults" -msgstr "excluir" - -#: rhodecode/templates/base/base.html:246 -msgid "settings" -msgstr "configurações" - -#: rhodecode/templates/base/base.html:256 -#: rhodecode/templates/base/base.html:258 -msgid "Followers" -msgstr "Seguidores" - -#: rhodecode/templates/base/base.html:264 -#: rhodecode/templates/base/base.html:266 -msgid "Forks" -msgstr "Bifurcações" - -#: rhodecode/templates/base/base.html:315 -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 -#: rhodecode/templates/search/search.html:52 -msgid "Search" -msgstr "Pesquisar" - -#: rhodecode/templates/base/root.html:42 -msgid "add another comment" -msgstr "adicionar outro comentário" +msgid "Log Out" +msgstr "Sair" + +#: rhodecode/templates/base/base.html:262 +msgid "Switch repository" +msgstr "Trocar repositório" + +#: rhodecode/templates/base/base.html:274 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "Diário" + +#: rhodecode/templates/base/base.html:286 +#, fuzzy +msgid "Search in repositories" +msgstr "em todos os repositórios" + +#: rhodecode/templates/base/perms_summary.html:8 +#, fuzzy +msgid "No permissions defined yet" +msgstr "Copiar permissões" + +#: rhodecode/templates/base/perms_summary.html:15 +msgid "Permission" +msgstr "Permissão" + +#: rhodecode/templates/base/perms_summary.html:16 +#, fuzzy +msgid "Edit Permission" +msgstr "Permissão de repositório" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/data_table/_dt_elements.html:140 -#: rhodecode/templates/summary/summary.html:57 -msgid "Stop following this repository" -msgstr "Parar de seguir este repositório" +#, fuzzy +msgid "Add another comment" +msgstr "adicionar outro comentário" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:140 +msgid "Stop following this repository" +msgstr "Parar de seguir este repositório" + +#: rhodecode/templates/base/root.html:45 msgid "Start following this repository" msgstr "Passar a seguir este repositório" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Group" msgstr "Grupo" +#: rhodecode/templates/base/root.html:47 +msgid "members" +msgstr "membros" + #: rhodecode/templates/base/root.html:48 -msgid "search truncated" -msgstr "pesquisa truncada" +#: rhodecode/templates/pullrequests/pullrequest.html:181 +#, fuzzy +msgid "Loading ..." +msgstr "carregando..." #: rhodecode/templates/base/root.html:49 -msgid "no matching files" -msgstr "nenhum arquivo corresponde" +#, fuzzy +msgid "Search truncated" +msgstr "pesquisa truncada" #: rhodecode/templates/base/root.html:50 -msgid "Open new pull request" -msgstr "" +#, fuzzy +msgid "No matching files" +msgstr "nenhum arquivo corresponde" #: rhodecode/templates/base/root.html:51 -msgid "Open new pull request for selected changesets" +#: rhodecode/templates/changelog/changelog.html:36 +msgid "Open new pull request" msgstr "" #: rhodecode/templates/base/root.html:52 -msgid "Show selected changes __S -> __E" -msgstr "Mostrar alterações selecionadas __S -> __E" +msgid "Open new pull request for selected changesets" +msgstr "" #: rhodecode/templates/base/root.html:53 +#, fuzzy +msgid "Show selected changesets __S -> __E" +msgstr "Mostrar alterações selecionadas __S -> __E" + +#: rhodecode/templates/base/root.html:54 +#, fuzzy +msgid "Show selected changeset __S" +msgstr "Mostrar alterações selecionadas __S -> __E" + +#: rhodecode/templates/base/root.html:55 msgid "Selection link" msgstr "Link da seleção" +#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/changeset/diff_block.html:8 +#, fuzzy +msgid "Collapse diff" +msgstr "Diff do arquivo" + +#: rhodecode/templates/base/root.html:57 +#, fuzzy +msgid "Expand diff" +msgstr "diff bruto" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, fuzzy, python-format msgid "%s Bookmarks" msgstr "marcadores" -#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "Autor" -#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks.html:38 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/tags/tags.html:55 +#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "Revisão" @@ -3348,16 +3507,14 @@ msgid "%s Branches" msgstr "ramos" -#: rhodecode/templates/branches/branches.html:29 +#: rhodecode/templates/branches/branches.html:26 #, fuzzy msgid "Compare branches" msgstr "ramos" -#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches.html:53 #: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/compare/compare_diff.html:5 -#: rhodecode/templates/compare/compare_diff.html:13 -#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:10 #, fuzzy msgid "Compare" @@ -3368,119 +3525,85 @@ msgid "%s Changelog" msgstr "Registro de alterações" -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/changelog/changelog.html:11 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "mostrando %d de %d revisão" msgstr[1] "mostrando %d de %d revisões" -#: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/changelog/changelog.html:30 #, fuzzy msgid "Clear selection" msgstr "Configurações de busca" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 #: rhodecode/templates/forks/forks_data.html:19 -#, python-format -msgid "compare fork with %s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:40 +#, fuzzy, python-format +msgid "Compare fork with %s" +msgstr "comparar exibir" + +#: rhodecode/templates/changelog/changelog.html:33 #, fuzzy msgid "Compare fork with parent" msgstr "comparar exibir" -#: rhodecode/templates/changelog/changelog.html:49 -msgid "Show" -msgstr "Mostrar" - -#: rhodecode/templates/changelog/changelog.html:74 -#: rhodecode/templates/summary/summary.html:375 -msgid "show more" +#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/summary/summary.html:404 +#, fuzzy +msgid "Show more" msgstr "mostrar mais" -#: rhodecode/templates/changelog/changelog.html:78 -msgid "Affected number of files, click to show more details" -msgstr "Número de arquivos afetados, clique para mostrar mais detalhes" - -#: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:65 -#: rhodecode/templates/changeset/changeset_file_comment.html:20 -#: rhodecode/templates/changeset/changeset_range.html:46 -#, fuzzy -msgid "Changeset status" -msgstr "Conjuntos de mudanças" - -#: rhodecode/templates/changelog/changelog.html:94 -#: rhodecode/templates/shortlog/shortlog_data.html:20 +#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changeset/changeset_range.html:86 #, fuzzy, python-format -msgid "Click to open associated pull request #%s" -msgstr "repositório [criado]" - -#: rhodecode/templates/changelog/changelog.html:104 -msgid "Parent" -msgstr "Progenitor" - -#: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:42 -msgid "No parents" -msgstr "Sem progenitores" - -#: rhodecode/templates/changelog/changelog.html:115 +msgid "Bookmark %s" +msgstr "marcadores" + +#: rhodecode/templates/changelog/changelog.html:95 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset_range.html:92 +#, fuzzy, python-format +msgid "Tag %s" +msgstr "etiquetas" + +#: rhodecode/templates/changelog/changelog.html:100 #: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:79 -msgid "merge" -msgstr "mesclar" - -#: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:109 -#: rhodecode/templates/changeset/changeset_range.html:82 -#: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_add.html:33 -#: rhodecode/templates/files/files_edit.html:33 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -msgid "branch" -msgstr "ramo" - -#: rhodecode/templates/changelog/changelog.html:124 -#: rhodecode/templates/changeset/changeset_range.html:88 -msgid "bookmark" -msgstr "marcador" - -#: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:114 -#: rhodecode/templates/changeset/changeset_range.html:94 -msgid "tag" -msgstr "etiqueta" - -#: rhodecode/templates/changelog/changelog.html:302 +#: rhodecode/templates/changeset/changeset_range.html:80 +#, fuzzy, python-format +msgid "Branch %s" +msgstr "ramos" + +#: rhodecode/templates/changelog/changelog.html:258 msgid "There are no changes yet" msgstr "Ainda não há alteações" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:94 -msgid "removed" +#: rhodecode/templates/changeset/changeset.html:91 +#, fuzzy +msgid "Removed" msgstr "removidos" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:95 -msgid "changed" +#: rhodecode/templates/changeset/changeset.html:92 +#, fuzzy +msgid "Changed" msgstr "alterados" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:96 -msgid "added" +#: rhodecode/templates/changeset/changeset.html:93 +#, fuzzy +msgid "Added" msgstr "adicionados" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:98 -#: rhodecode/templates/changeset/changeset.html:99 -#: rhodecode/templates/changeset/changeset.html:100 -#, python-format -msgid "affected %s files" +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changeset/changeset.html:97 +#, fuzzy, python-format +msgid "Affected %s files" msgstr "%s arquivos afetados" #: rhodecode/templates/changeset/changeset.html:6 @@ -3488,30 +3611,39 @@ msgid "%s Changeset" msgstr "Conjunto de Mudanças" -#: rhodecode/templates/changeset/changeset.html:14 -msgid "Changeset" -msgstr "Conjunto de Mudanças" - -#: rhodecode/templates/changeset/changeset.html:52 +#: rhodecode/templates/changeset/changeset.html:39 +msgid "No parents" +msgstr "Sem progenitores" + +#: rhodecode/templates/changeset/changeset.html:49 msgid "No children" msgstr "" -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/diff_block.html:20 -msgid "raw diff" +#: rhodecode/templates/changeset/changeset.html:62 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:44 +#, fuzzy +msgid "Changeset status" +msgstr "Conjuntos de mudanças" + +#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/diff_block.html:23 +#, fuzzy +msgid "Raw diff" msgstr "diff bruto" -#: rhodecode/templates/changeset/changeset.html:71 -#, fuzzy -msgid "patch diff" +#: rhodecode/templates/changeset/changeset.html:68 +#, fuzzy +msgid "Patch diff" msgstr "diff bruto" -#: rhodecode/templates/changeset/changeset.html:72 -#: rhodecode/templates/changeset/diff_block.html:21 -msgid "download diff" +#: rhodecode/templates/changeset/changeset.html:69 +#: rhodecode/templates/changeset/diff_block.html:24 +#, fuzzy +msgid "Download diff" msgstr "descarregar diff" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "%d comment" @@ -3519,7 +3651,7 @@ msgstr[0] "%d comentário" msgstr[1] "%d comentários" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "(%d inline)" @@ -3527,32 +3659,54 @@ msgstr[0] "(%d em linha)" msgstr[1] "(%d em linha)" -#: rhodecode/templates/changeset/changeset.html:122 -#: rhodecode/templates/compare/compare_diff.html:44 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:77 +msgid "merge" +msgstr "mesclar" + +#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/compare/compare_diff.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, fuzzy, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "arquivo alterado" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:124 -#: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/pullrequests/pullrequest_show.html:96 +#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/compare/compare_diff.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, fuzzy, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s arquivos afetados com %s inserções e %s exclusões" msgstr[1] "" +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Showing a huge diff might take some time and resources" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +#, fuzzy +msgid "Show full diff" +msgstr "Carregando lista de arquivos..." + #: rhodecode/templates/changeset/changeset_file_comment.html:30 #, fuzzy, python-format -msgid "Status from pull request %s" +msgid "Status change on pull request #%s" msgstr "Criar novo arquivo" #: rhodecode/templates/changeset/changeset_file_comment.html:32 #, fuzzy, python-format -msgid "Comment from pull request %s" +msgid "Comment on pull request #%s" msgstr "repositório [criado]" #: rhodecode/templates/changeset/changeset_file_comment.html:57 @@ -3564,27 +3718,27 @@ msgstr "Comentando a linha {1}." #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:139 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "Comentários interpretados usando a sintaxe %s com suporte a %s." #: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:142 +#: rhodecode/templates/changeset/changeset_file_comment.html:141 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" "Use @nomedeusuário dentro desse texto para enviar notificação a este " "usuário do RhodeCode" #: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:162 +#: rhodecode/templates/changeset/changeset_file_comment.html:161 msgid "Comment" msgstr "Comentário" #: rhodecode/templates/changeset/changeset_file_comment.html:75 -#: rhodecode/templates/changeset/changeset_file_comment.html:86 -msgid "Hide" -msgstr "Ocultar" +#, fuzzy +msgid "Cancel" +msgstr "alterados" #: rhodecode/templates/changeset/changeset_file_comment.html:82 msgid "You need to be logged in to comment." @@ -3594,20 +3748,16 @@ msgid "Login now" msgstr "Entrar agora" -#: rhodecode/templates/changeset/changeset_file_comment.html:137 -msgid "Leave a comment" -msgstr "Deixar um comentário" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "Check this to change current status of code-review for this changeset" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -#, fuzzy -msgid "change status" +#: rhodecode/templates/changeset/changeset_file_comment.html:86 +msgid "Hide" +msgstr "Ocultar" + +#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#, fuzzy +msgid "Change status" msgstr "Conjuntos de mudanças" -#: rhodecode/templates/changeset/changeset_file_comment.html:164 +#: rhodecode/templates/changeset/changeset_file_comment.html:163 msgid "Comment and close" msgstr "" @@ -3616,73 +3766,80 @@ msgid "%s Changesets" msgstr "Conjuntos de mudanças" -#: rhodecode/templates/changeset/changeset_range.html:29 -#: rhodecode/templates/compare/compare_diff.html:29 -msgid "Compare View" -msgstr "Exibir Comparação" - -#: rhodecode/templates/changeset/changeset_range.html:29 -#, fuzzy -msgid "Show combined compare" -msgstr "mostrar comentários em linha" - -#: rhodecode/templates/changeset/changeset_range.html:54 +#: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" msgstr "Arquivos afetados" -#: rhodecode/templates/changeset/diff_block.html:19 -msgid "show full diff for this file" +#: rhodecode/templates/changeset/diff_block.html:22 +msgid "Show full diff for this file" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:27 -msgid "show inline comments" +#: rhodecode/templates/changeset/diff_block.html:30 +#, fuzzy +msgid "Show inline comments" msgstr "mostrar comentários em linha" -#: rhodecode/templates/compare/compare_cs.html:5 +#: rhodecode/templates/changeset/diff_block.html:55 +msgid "Show file at latest version in this repo" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:56 +msgid "Show file at initial version in this repo" +msgstr "" + +#: rhodecode/templates/compare/compare_cs.html:4 #, fuzzy msgid "No changesets" msgstr "Nenhum conjunto de alterações ainda." -#: rhodecode/templates/compare/compare_diff.html:37 -#: rhodecode/templates/pullrequests/pullrequest_show.html:87 +#: rhodecode/templates/compare/compare_cs.html:32 +#, fuzzy +msgid "Ancestor" +msgstr "ramos" + +#: rhodecode/templates/compare/compare_diff.html:5 +#, fuzzy, python-format +msgid "%s Compare" +msgstr "comparar exibir" + +#: rhodecode/templates/compare/compare_diff.html:9 +#, fuzzy +msgid "Compare revisions" +msgstr "revisão anterior" + +#: rhodecode/templates/compare/compare_diff.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:106 #, fuzzy, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "mostrar comentários em linha" msgstr[1] "" -#: rhodecode/templates/compare/compare_diff.html:52 -#: rhodecode/templates/pullrequests/pullrequest_show.html:102 +#: rhodecode/templates/compare/compare_diff.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:121 #, fuzzy msgid "No files" msgstr "arquivos" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 -msgid "Fork" -msgstr "Bifurcação" +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +msgid "confirm to show potentially huge diff" +msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:54 -#: rhodecode/templates/summary/summary.html:77 +#: rhodecode/templates/summary/summary.html:69 msgid "Mercurial repository" msgstr "Repositório Mercurial" #: rhodecode/templates/data_table/_dt_elements.html:56 -#: rhodecode/templates/summary/summary.html:80 +#: rhodecode/templates/summary/summary.html:72 msgid "Git repository" msgstr "Repositório Git" -#: rhodecode/templates/data_table/_dt_elements.html:63 -#: rhodecode/templates/summary/summary.html:87 -msgid "public repository" -msgstr "repositório público" - #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/summary/summary.html:96 -#: rhodecode/templates/summary/summary.html:97 -msgid "Fork of" -msgstr "Bifurcação de" +#, fuzzy, python-format +msgid "Fork of %s" +msgstr "nome da bifurcação" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3710,30 +3867,46 @@ msgid "Confirm to delete this user: %s" msgstr "Confirma excluir este usuário: %s" -#: rhodecode/templates/email_templates/changeset_comment.html:10 -#, fuzzy -msgid "New status$" +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:15 +#, fuzzy +msgid "New status" msgstr "Conjuntos de mudanças" +#: rhodecode/templates/email_templates/changeset_comment.html:11 +#: rhodecode/templates/email_templates/pull_request_comment.html:9 +msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:14 +#, fuzzy +msgid "Repo" +msgstr "Meus repositórios" + +#: rhodecode/templates/email_templates/changeset_comment.html:16 +msgid "desc" +msgstr "" + #: rhodecode/templates/email_templates/main.html:8 #, fuzzy msgid "This is a notification from RhodeCode." msgstr "Esta é uma notificação do RhodeCode." #: rhodecode/templates/email_templates/password_reset.html:4 -msgid "Hello" +#, python-format +msgid "Hello %s" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.html:5 +msgid "We received a request to create a new password for your account." msgstr "" #: rhodecode/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.html:8 msgid "You can generate it by clicking following URL" msgstr "" -#: rhodecode/templates/email_templates/password_reset.html:12 -msgid "If you didn't request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:11 +msgid "If you did not request new password please ignore this email." msgstr "" #: rhodecode/templates/email_templates/pull_request.html:4 @@ -3745,37 +3918,32 @@ #: rhodecode/templates/email_templates/pull_request.html:5 #, fuzzy +msgid "View this pull request here" +msgstr "Confirma excluir este repositório" + +#: rhodecode/templates/email_templates/pull_request.html:6 +#, fuzzy msgid "title" msgstr "escrever" -#: rhodecode/templates/email_templates/pull_request.html:6 -#: rhodecode/templates/pullrequests/pullrequest.html:115 +#: rhodecode/templates/email_templates/pull_request.html:7 #, fuzzy msgid "description" msgstr "Descrição" -#: rhodecode/templates/email_templates/pull_request.html:7 -#, fuzzy -msgid "View this pull request here" -msgstr "Confirma excluir este repositório" - #: rhodecode/templates/email_templates/pull_request.html:12 msgid "revisions for reviewing" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:3 #, fuzzy, python-format -msgid "User %s commented on pull request #%s for repository %s" +msgid "Pull request #%s for repository %s" msgstr "repositório [criado]" -#: rhodecode/templates/email_templates/pull_request_comment.html:10 -#, fuzzy -msgid "New status" -msgstr "Conjuntos de mudanças" - -#: rhodecode/templates/email_templates/pull_request_comment.html:14 -msgid "View this comment here" -msgstr "" +#: rhodecode/templates/email_templates/pull_request_comment.html:13 +#, fuzzy +msgid "Closing pull request with status" +msgstr "repositório [criado]" #: rhodecode/templates/email_templates/registration.html:4 #, fuzzy @@ -3786,109 +3954,115 @@ msgid "View this user here" msgstr "" -#: rhodecode/templates/errors/error_document.html:46 +#: rhodecode/templates/errors/error_document.html:55 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "Você será redirecionado para %s em %s segundos" #: rhodecode/templates/files/file_diff.html:4 #, fuzzy, python-format -msgid "%s File diff" +msgid "%s File Diff" msgstr "Diff do arquivo" -#: rhodecode/templates/files/file_diff.html:12 +#: rhodecode/templates/files/file_diff.html:8 msgid "File diff" msgstr "Diff do arquivo" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:74 +#: rhodecode/templates/files/files.html:76 #, fuzzy, python-format -msgid "%s files" +msgid "%s Files" msgstr "arquivos" -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:351 -msgid "files" -msgstr "arquivos" +#: rhodecode/templates/files/files.html:30 +#: rhodecode/templates/files/files_add.html:31 +#: rhodecode/templates/files/files_edit.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +#, fuzzy +msgid "Branch" +msgstr "ramo" #: rhodecode/templates/files/files_add.html:4 -#: rhodecode/templates/files/files_edit.html:4 #, fuzzy, python-format -msgid "%s Edit file" -msgstr "editar arquivo" +msgid "%s Files Add" +msgstr "arquivos" #: rhodecode/templates/files/files_add.html:19 -msgid "add file" +#, fuzzy +msgid "Add file" msgstr "adicionar arquivo" -#: rhodecode/templates/files/files_add.html:40 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:78 msgid "Add new file" msgstr "Adicionar novo arquivo" -#: rhodecode/templates/files/files_add.html:45 +#: rhodecode/templates/files/files_add.html:43 msgid "File Name" msgstr "Nome de Arquivo" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:56 msgid "or" msgstr "ou" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:54 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:52 msgid "Upload file" msgstr "Enviar arquivo" -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:56 msgid "Create new file" msgstr "Criar novo arquivo" -#: rhodecode/templates/files/files_add.html:63 -#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_add.html:61 +#: rhodecode/templates/files/files_edit.html:37 #: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Local" -#: rhodecode/templates/files/files_add.html:67 +#: rhodecode/templates/files/files_add.html:65 msgid "use / to separate directories" msgstr "use / para separar diretórios" -#: rhodecode/templates/files/files_add.html:77 -#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 #: rhodecode/templates/shortlog/shortlog_data.html:6 -msgid "commit message" +#, fuzzy +msgid "Commit message" msgstr "mensagem de commit" -#: rhodecode/templates/files/files_add.html:81 -#: rhodecode/templates/files/files_edit.html:67 +#: rhodecode/templates/files/files_add.html:79 +#: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "Realizar commit das alterações" #: rhodecode/templates/files/files_browser.html:13 -msgid "view" +#, fuzzy +msgid "View" msgstr "ver" #: rhodecode/templates/files/files_browser.html:14 -msgid "previous revision" +#, fuzzy +msgid "Previous revision" msgstr "revisão anterior" #: rhodecode/templates/files/files_browser.html:16 -msgid "next revision" +#, fuzzy +msgid "Next revision" msgstr "próxima revisão" #: rhodecode/templates/files/files_browser.html:23 -msgid "follow current branch" +#, fuzzy +msgid "Follow current branch" msgstr "seguir ramo atual" #: rhodecode/templates/files/files_browser.html:27 -msgid "search file list" +#, fuzzy +msgid "Search file list" msgstr "pesquisar lista de arquivos" -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -msgid "add new file" -msgstr "adicionar novo arquivo" - #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." msgstr "Carregando lista de arquivos..." @@ -3913,31 +4087,41 @@ msgid "Last committer" msgstr "Último commiter" +#: rhodecode/templates/files/files_edit.html:4 +#, fuzzy, python-format +msgid "%s Files Edit" +msgstr "arquivos" + #: rhodecode/templates/files/files_edit.html:19 -msgid "edit file" +#, fuzzy +msgid "Edit file" msgstr "editar arquivo" -#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -msgid "show annotation" +#, fuzzy +msgid "Show annotation" msgstr "mostrar anotação" -#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_edit.html:48 #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 -msgid "show as raw" +#, fuzzy +msgid "Show as raw" msgstr "mostrar como bruto" -#: rhodecode/templates/files/files_edit.html:51 +#: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -msgid "download as raw" +#, fuzzy +msgid "Download as raw" msgstr "descarregar como bruto" -#: rhodecode/templates/files/files_edit.html:54 -msgid "source" +#: rhodecode/templates/files/files_edit.html:52 +#, fuzzy +msgid "Source" msgstr "fonte" -#: rhodecode/templates/files/files_edit.html:59 +#: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" msgstr "Editando arquivo" @@ -3947,17 +4131,17 @@ #: rhodecode/templates/files/files_history_box.html:9 #, fuzzy -msgid "diff to revision" +msgid "Diff to revision" msgstr "próxima revisão" #: rhodecode/templates/files/files_history_box.html:10 #, fuzzy -msgid "show at revision" +msgid "Show at revision" msgstr "próxima revisão" #: rhodecode/templates/files/files_history_box.html:11 #, fuzzy -msgid "show full history" +msgid "Show full history" msgstr "Carregando lista de arquivos..." #: rhodecode/templates/files/files_history_box.html:16 @@ -3973,17 +4157,19 @@ msgstr "Carregando lista de arquivos..." #: rhodecode/templates/files/files_source.html:21 -msgid "show source" +#, fuzzy +msgid "Show source" msgstr "mostrar fonte" #: rhodecode/templates/files/files_source.html:29 #, fuzzy, python-format -msgid "edit on branch:%s" +msgid "Edit on branch:%s" msgstr "excluído o repositório %s" #: rhodecode/templates/files/files_source.html:31 -msgid "edit on branch:?" -msgstr "" +#, fuzzy +msgid "Edit on branch:?" +msgstr "excluído o repositório %s" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -4015,9 +4201,11 @@ msgid "%s Followers" msgstr "seguidores" -#: rhodecode/templates/followers/followers.html:13 -msgid "followers" -msgstr "seguidores" +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:184 +msgid "Followers" +msgstr "Seguidores" #: rhodecode/templates/followers/followers_data.html:12 #, fuzzy @@ -4029,32 +4217,33 @@ msgid "%s Fork" msgstr "bifurcação" -#: rhodecode/templates/forks/fork.html:31 +#: rhodecode/templates/forks/fork.html:28 msgid "Fork name" msgstr "Nome da bifurcação" -#: rhodecode/templates/forks/fork.html:68 +#: rhodecode/templates/forks/fork.html:65 msgid "Private" msgstr "Privado" -#: rhodecode/templates/forks/fork.html:77 +#: rhodecode/templates/forks/fork.html:74 msgid "Copy permissions" msgstr "Copiar permissões" -#: rhodecode/templates/forks/fork.html:81 +#: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" msgstr "" -#: rhodecode/templates/forks/fork.html:86 +#: rhodecode/templates/forks/fork.html:84 msgid "Update after clone" msgstr "Atualizar após clonar" -#: rhodecode/templates/forks/fork.html:90 +#: rhodecode/templates/forks/fork.html:88 msgid "Checkout source after making a clone" msgstr "" -#: rhodecode/templates/forks/fork.html:94 -msgid "fork this repository" +#: rhodecode/templates/forks/fork.html:93 +#, fuzzy +msgid "Fork this repository" msgstr "bifurcar este repositório" #: rhodecode/templates/forks/forks.html:5 @@ -4062,19 +4251,17 @@ msgid "%s Forks" msgstr "bifurcações" -#: rhodecode/templates/forks/forks.html:13 -msgid "forks" -msgstr "bifurcações" +#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/summary/summary.html:189 +#: rhodecode/templates/summary/summary.html:190 +msgid "Forks" +msgstr "Bifurcações" #: rhodecode/templates/forks/forks_data.html:17 -msgid "forked" +#, fuzzy +msgid "Forked" msgstr "bifurcado" -#: rhodecode/templates/forks/forks_data.html:21 -#, fuzzy -msgid "Compare fork" -msgstr "comparar exibir" - #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "Ainda não há bifurcações" @@ -4090,22 +4277,15 @@ msgstr "diário público de %s - feed %s" #: rhodecode/templates/journal/journal.html:32 -#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "Atualizar" #: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 -#, fuzzy -msgid "RSS feed" -msgstr "%s - feed %s" - -#: rhodecode/templates/journal/journal.html:38 -#: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:51 msgid "Watched" msgstr "Seguindo" @@ -4113,6 +4293,11 @@ msgid "No entries yet" msgstr "Ainda não há entradas" +#: rhodecode/templates/journal/public_journal.html:4 +#: rhodecode/templates/journal/public_journal.html:21 +msgid "Public Journal" +msgstr "Diário Público" + #: rhodecode/templates/journal/public_journal.html:13 #, fuzzy msgid "ATOM public journal feed" @@ -4123,163 +4308,140 @@ msgid "RSS public journal feed" msgstr "diário público de %s - feed %s" -#: rhodecode/templates/journal/public_journal.html:21 -msgid "Public Journal" -msgstr "Diário Público" - #: rhodecode/templates/pullrequests/pullrequest.html:4 -#: rhodecode/templates/pullrequests/pullrequest.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:54 -msgid "refresh overview" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:52 #, fuzzy msgid "Detailed compare view" msgstr "comparar exibir" -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:118 +#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 #, fuzzy msgid "owner" msgstr "Dono" -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:145 +#: rhodecode/templates/pullrequests/pullrequest.html:77 msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:97 +#: rhodecode/templates/pullrequests/pullrequest.html:83 #, fuzzy msgid "Create new pull request" msgstr "Criar novo arquivo" -#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest.html:92 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 #, fuzzy msgid "Title" msgstr "escrever" -#: rhodecode/templates/pullrequests/pullrequest.html:123 +#: rhodecode/templates/pullrequests/pullrequest.html:109 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "Closed %s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "with status %s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:31 -#, fuzzy -msgid "Status" +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#, fuzzy, python-format +msgid "%s Pull Request #%s" +msgstr "comentado no commit" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#, fuzzy +msgid "Review status" msgstr "Conjuntos de mudanças" -#: rhodecode/templates/pullrequests/pullrequest_show.html:36 +#: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 -msgid "pull request was reviewed by all reviewers" +#: rhodecode/templates/pullrequests/pullrequest_show.html:59 +msgid "Pull request was reviewed by all reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Origin repository" msgstr "Repositório Git" -#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 #, fuzzy msgid "Created on" msgstr "criar um agora" -#: rhodecode/templates/pullrequests/pullrequest_show.html:83 +#: rhodecode/templates/pullrequests/pullrequest_show.html:102 #, fuzzy msgid "Compare view" msgstr "comparar exibir" -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 #, fuzzy msgid "reviewer" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:164 +#, fuzzy +msgid "Add or remove reviewer to this pull request." +msgstr "Confirma excluir este repositório" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:168 +#, fuzzy +msgid "Save changes" +msgstr "Sem alterações" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -#, fuzzy -msgid "all pull requests" -msgstr "Criar novo arquivo" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 -msgid "All pull requests" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 -msgid "Closed" -msgstr "" +#, fuzzy, python-format +msgid "%s Pull Requests" +msgstr "comentado no commit" #: rhodecode/templates/search/search.html:6 -#, fuzzy, python-format -msgid "Search \"%s\" in repository: %s" +#, fuzzy +msgid "Search repository" msgstr "no repositório" #: rhodecode/templates/search/search.html:8 -#, fuzzy, python-format -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 "Search in repository: %s" -msgstr "no repositório" - -#: rhodecode/templates/search/search.html:14 -#: rhodecode/templates/search/search.html:34 +#: rhodecode/templates/search/search.html:16 #, fuzzy msgid "Search in all repositories" msgstr "em todos os repositórios" -#: rhodecode/templates/search/search.html:48 +#: rhodecode/templates/search/search.html:50 msgid "Search term" msgstr "Termo de pesquisa" -#: rhodecode/templates/search/search.html:60 +#: rhodecode/templates/search/search.html:62 msgid "Search in" msgstr "Pesquisando em" -#: rhodecode/templates/search/search.html:63 +#: rhodecode/templates/search/search.html:65 msgid "File contents" msgstr "Conteúdo dos arquivos" -#: rhodecode/templates/search/search.html:64 +#: rhodecode/templates/search/search.html:66 #, fuzzy msgid "Commit messages" msgstr "mensagem de commit" -#: rhodecode/templates/search/search.html:65 +#: rhodecode/templates/search/search.html:67 msgid "File names" msgstr "Nomes dos arquivos" @@ -4289,42 +4451,25 @@ msgid "Permission denied" msgstr "Permissão negada" -#: rhodecode/templates/settings/repo_settings.html:5 -#, fuzzy, python-format -msgid "%s Settings" -msgstr "configurações" - -#: rhodecode/templates/settings/repo_settings.html:102 -#, fuzzy -msgid "Delete repository" -msgstr "[excluir] repositório" - -#: rhodecode/templates/settings/repo_settings.html:109 -#, fuzzy -msgid "Remove repo" -msgstr "remover" - #: rhodecode/templates/shortlog/shortlog.html:5 #, fuzzy, python-format -msgid "%s Shortlog" -msgstr "log resumido" - +msgid "%s Lightweight Changelog" +msgstr "arquivo alterado" + +#: rhodecode/templates/shortlog/shortlog.html:11 #: rhodecode/templates/shortlog/shortlog.html:15 -#: rhodecode/templates/shortlog/shortlog.html:19 -msgid "shortlog" -msgstr "log resumido" - -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "revisão" +msgid "Lightweight Changelog" +msgstr "" #: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "age" +#, fuzzy +msgid "Age" msgstr "idade" -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "autor" +#: rhodecode/templates/shortlog/shortlog_data.html:20 +#, fuzzy, python-format +msgid "Click to open associated pull request #%s" +msgstr "repositório [criado]" #: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" @@ -4343,158 +4488,172 @@ msgid "%s Summary" msgstr "sumário" -#: rhodecode/templates/summary/summary.html:12 -msgid "summary" -msgstr "sumário" - -#: rhodecode/templates/summary/summary.html:20 +#: rhodecode/templates/summary/summary.html:16 #, fuzzy, python-format -msgid "repo %s ATOM feed" -msgstr "Assinar o feed atom de %s" - -#: rhodecode/templates/summary/summary.html:21 +msgid "%s ATOM feed" +msgstr "%s - feed %s" + +#: rhodecode/templates/summary/summary.html:17 #, fuzzy, python-format -msgid "repo %s RSS feed" -msgstr "Assinar o feed rss de %s" - -#: rhodecode/templates/summary/summary.html:49 -#: rhodecode/templates/summary/summary.html:52 -msgid "ATOM" -msgstr "ATOM" - -#: rhodecode/templates/summary/summary.html:70 +msgid "%s RSS feed" +msgstr "%s - feed %s" + +#: rhodecode/templates/summary/summary.html:62 #, fuzzy, python-format msgid "Repository locked by %s" msgstr "repositórios" -#: rhodecode/templates/summary/summary.html:72 +#: rhodecode/templates/summary/summary.html:64 #, fuzzy msgid "Repository unlocked" msgstr "repositórios" -#: rhodecode/templates/summary/summary.html:91 +#: rhodecode/templates/summary/summary.html:83 #, python-format msgid "Non changable ID %s" msgstr "ID não alterável %s" -#: rhodecode/templates/summary/summary.html:96 -msgid "public" +#: rhodecode/templates/summary/summary.html:88 +#, fuzzy +msgid "Public" msgstr "público" -#: rhodecode/templates/summary/summary.html:104 -msgid "remote clone" +#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:89 +msgid "Fork of" +msgstr "Bifurcação de" + +#: rhodecode/templates/summary/summary.html:96 +#, fuzzy +msgid "Remote clone" msgstr "clone remoto" -#: rhodecode/templates/summary/summary.html:125 +#: rhodecode/templates/summary/summary.html:117 msgid "Contact" msgstr "Contato" -#: rhodecode/templates/summary/summary.html:139 +#: rhodecode/templates/summary/summary.html:131 msgid "Clone url" msgstr "URL de clonagem" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:136 msgid "Show by Name" msgstr "Mostrar por Nome" -#: rhodecode/templates/summary/summary.html:143 +#: rhodecode/templates/summary/summary.html:137 msgid "Show by ID" msgstr "Mostrar por ID" -#: rhodecode/templates/summary/summary.html:151 +#: rhodecode/templates/summary/summary.html:143 msgid "Trending files" msgstr "Tendências em arquivos" -#: rhodecode/templates/summary/summary.html:159 -#: rhodecode/templates/summary/summary.html:175 -#: rhodecode/templates/summary/summary.html:203 +#: rhodecode/templates/summary/summary.html:151 +#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:232 msgid "enable" msgstr "habilitar" -#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:159 msgid "Download" msgstr "Download" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:163 msgid "There are no downloads yet" msgstr "Ainda não há downloads" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:165 msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: rhodecode/templates/summary/summary.html:179 +#: rhodecode/templates/summary/summary.html:171 #, fuzzy msgid "Download as zip" msgstr "descarregar como bruto" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" msgstr "Marque isto para descarregar arquivo com subrepositórios" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "with subrepos" msgstr "com subrepositórios" -#: rhodecode/templates/summary/summary.html:195 +#: rhodecode/templates/summary/summary.html:197 +#, fuzzy +msgid "Repository Size" +msgstr "repositórios" + +#: rhodecode/templates/summary/summary.html:204 +#: rhodecode/templates/summary/summary.html:206 +#, fuzzy +msgid "Feed" +msgstr "%s - feed %s" + +#: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "Atividade de commit por dia / autor" -#: rhodecode/templates/summary/summary.html:206 +#: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "Estatísticas coletadas:" -#: rhodecode/templates/summary/summary.html:227 -msgid "Shortlog" -msgstr "Log resumido" - -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:256 +#, fuzzy +msgid "Latest changes" +msgstr "Última alteração" + +#: rhodecode/templates/summary/summary.html:258 msgid "Quick start" msgstr "Início rápido" -#: rhodecode/templates/summary/summary.html:243 +#: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:246 +#: rhodecode/templates/summary/summary.html:275 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:304 +#: rhodecode/templates/summary/summary.html:333 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" -#: rhodecode/templates/summary/summary.html:661 +#: rhodecode/templates/summary/summary.html:380 +msgid "files" +msgstr "arquivos" + +#: rhodecode/templates/summary/summary.html:690 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:662 +#: rhodecode/templates/summary/summary.html:691 msgid "files added" msgstr "arquivos adicionados" -#: rhodecode/templates/summary/summary.html:663 +#: rhodecode/templates/summary/summary.html:692 msgid "files changed" msgstr "arquivos alterados" -#: rhodecode/templates/summary/summary.html:664 +#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "arquivos removidos" -#: rhodecode/templates/summary/summary.html:667 +#: rhodecode/templates/summary/summary.html:695 msgid "commit" msgstr "commit" -#: rhodecode/templates/summary/summary.html:668 +#: rhodecode/templates/summary/summary.html:696 msgid "file added" msgstr "arquivo adicionado" -#: rhodecode/templates/summary/summary.html:669 +#: rhodecode/templates/summary/summary.html:697 msgid "file changed" msgstr "arquivo alterado" -#: rhodecode/templates/summary/summary.html:670 +#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "arquivo removido" @@ -4503,7 +4662,7 @@ msgid "%s Tags" msgstr "%s atrás" -#: rhodecode/templates/tags/tags.html:29 +#: rhodecode/templates/tags/tags.html:26 #, fuzzy msgid "Compare tags" msgstr "comparar exibir"
--- a/rhodecode/i18n/rhodecode.pot Fri Apr 05 14:09:23 2013 +0200 +++ b/rhodecode/i18n/rhodecode.pot Fri Apr 05 19:21:52 2013 +0200 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.5.3b\n" +"Project-Id-Version: RhodeCode 1.6.0b\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-01-28 00:24+0100\n" +"POT-Creation-Date: 2013-04-05 10:19-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -22,11 +22,11 @@ msgstr "" #: rhodecode/controllers/changeset.py:83 -msgid "show white space" +msgid "Show white space" msgstr "" #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 -msgid "ignore white space" +msgid "Ignore white space" msgstr "" #: rhodecode/controllers/changeset.py:163 @@ -34,7 +34,7 @@ msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:329 rhodecode/controllers/pullrequests.py:416 +#: rhodecode/controllers/changeset.py:329 rhodecode/controllers/pullrequests.py:438 #, python-format msgid "Status change -> %s" msgstr "" @@ -45,7 +45,7 @@ "allowed" msgstr "" -#: rhodecode/controllers/compare.py:75 rhodecode/controllers/pullrequests.py:121 +#: rhodecode/controllers/compare.py:74 rhodecode/controllers/pullrequests.py:167 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "" @@ -87,106 +87,115 @@ msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:137 -#: rhodecode/templates/changeset/changeset.html:149 -#: rhodecode/templates/compare/compare_diff.html:62 -#: rhodecode/templates/compare/compare_diff.html:73 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 -#: rhodecode/templates/pullrequests/pullrequest_show.html:171 +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Changeset was too big and was cut off..." msgstr "" -#: rhodecode/controllers/feed.py:92 -msgid "commited on" -msgstr "" - -#: rhodecode/controllers/files.py:86 -msgid "click here to add new file" -msgstr "" - -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/feed.py:91 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: rhodecode/controllers/files.py:88 +msgid "Click here to add new file" +msgstr "" + +#: rhodecode/controllers/files.py:89 #, python-format msgid "There are no files yet %s" msgstr "" -#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338 +#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:281 +#: rhodecode/controllers/files.py:279 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:295 +#: rhodecode/controllers/files.py:293 #, python-format msgid "Edited file %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:311 +#: rhodecode/controllers/files.py:309 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384 +#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390 +#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:350 +#: rhodecode/controllers/files.py:347 msgid "Added file via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:370 +#: rhodecode/controllers/files.py:364 msgid "No content" msgstr "" -#: rhodecode/controllers/files.py:374 +#: rhodecode/controllers/files.py:368 msgid "No filename" msgstr "" -#: rhodecode/controllers/files.py:416 -msgid "downloads disabled" -msgstr "" - -#: rhodecode/controllers/files.py:427 -#, python-format -msgid "Unknown revision %s" -msgstr "" - -#: rhodecode/controllers/files.py:429 -msgid "Empty repository" +#: rhodecode/controllers/files.py:372 +msgid "Location must be relative path and must not contain .. in path" +msgstr "" + +#: rhodecode/controllers/files.py:420 +msgid "Downloads disabled" msgstr "" #: rhodecode/controllers/files.py:431 +#, python-format +msgid "Unknown revision %s" +msgstr "" + +#: rhodecode/controllers/files.py:433 +msgid "Empty repository" +msgstr "" + +#: rhodecode/controllers/files.py:435 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:576 -#: rhodecode/templates/changeset/changeset_range.html:13 -#: rhodecode/templates/changeset/changeset_range.html:31 +#: rhodecode/controllers/files.py:617 +#: rhodecode/templates/changeset/changeset_range.html:9 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564 +#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 +#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78 -#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575 +#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 +#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:165 +#: rhodecode/controllers/forks.py:175 #, python-format -msgid "forked %s repository as %s" -msgstr "" - -#: rhodecode/controllers/forks.py:179 +msgid "Forked repository %s as %s" +msgstr "" + +#: rhodecode/controllers/forks.py:189 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -196,48 +205,67 @@ msgstr "" #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 -#: rhodecode/templates/base/base.html:238 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "" -#: rhodecode/controllers/login.py:142 -msgid "You have successfully registered into rhodecode" -msgstr "" - -#: rhodecode/controllers/login.py:163 +#: rhodecode/controllers/login.py:138 +msgid "You have successfully registered into RhodeCode" +msgstr "" + +#: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" msgstr "" -#: rhodecode/controllers/login.py:183 +#: rhodecode/controllers/login.py:179 msgid "Your password reset was successful, new password has been sent to your email" msgstr "" -#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570 +#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/email_templates/changeset_comment.html:15 +msgid "Changeset" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:128 +msgid "Special" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:129 +msgid "Peer branches" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:190 +#: rhodecode/controllers/pullrequests.py:228 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:192 -msgid "error during creation of pull request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:224 +#: rhodecode/controllers/pullrequests.py:230 +msgid "Error creating pull request" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:251 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:227 +#: rhodecode/controllers/pullrequests.py:254 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:260 +#: rhodecode/controllers/pullrequests.py:287 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:451 +#: rhodecode/controllers/pullrequests.py:441 +msgid "Closing with" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:478 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" @@ -253,50 +281,12 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:120 rhodecode/controllers/admin/repos.py:254 -#, python-format -msgid "Repository %s updated successfully" -msgstr "" - -#: rhodecode/controllers/settings.py:138 rhodecode/controllers/admin/repos.py:272 -#, python-format -msgid "error occurred during update of repository %s" -msgstr "" - -#: rhodecode/controllers/settings.py:163 rhodecode/controllers/admin/repos.py:297 -#, python-format -msgid "deleted repository %s" -msgstr "" - -#: rhodecode/controllers/settings.py:167 rhodecode/controllers/admin/repos.py:307 -#: rhodecode/controllers/admin/repos.py:313 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "" - -#: rhodecode/controllers/settings.py:186 -msgid "unlocked" -msgstr "" - -#: rhodecode/controllers/settings.py:189 -msgid "locked" -msgstr "" - -#: rhodecode/controllers/settings.py:191 -#, python-format -msgid "Repository has been %s" -msgstr "" - -#: rhodecode/controllers/settings.py:195 rhodecode/controllers/admin/repos.py:405 -msgid "An error occurred during unlocking" -msgstr "" - -#: rhodecode/controllers/summary.py:140 +#: rhodecode/controllers/summary.py:141 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:144 -#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/controllers/summary.py:147 +#: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "" @@ -305,7 +295,7 @@ msgstr "" #: rhodecode/controllers/admin/defaults.py:110 -msgid "error occurred during update of defaults" +msgid "Error occurred during update of defaults" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:50 @@ -361,7 +351,7 @@ msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:147 -msgid "error occurred during update of ldap settings" +msgid "Error occurred during update of ldap settings" msgstr "" #: rhodecode/controllers/admin/permissions.py:60 @@ -384,41 +374,40 @@ #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 -#: rhodecode/templates/admin/repos/repo_add.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:9 +#: rhodecode/templates/admin/repos/repo_add.html:10 +#: rhodecode/templates/admin/repos/repo_add.html:14 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:133 #: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/admin/users/users.html:85 #: 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:203 rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:292 rhodecode/templates/base/base.html:293 +#: rhodecode/templates/base/base.html:299 rhodecode/templates/base/base.html:300 msgid "Admin" msgstr "" #: rhodecode/controllers/admin/permissions.py:70 -msgid "disabled" +#: rhodecode/controllers/admin/permissions.py:76 +#: rhodecode/controllers/admin/permissions.py:79 +msgid "Disabled" msgstr "" #: rhodecode/controllers/admin/permissions.py:72 -msgid "allowed with manual account activation" +msgid "Allowed with manual account activation" msgstr "" #: rhodecode/controllers/admin/permissions.py:74 -msgid "allowed with automatic account activation" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:76 -#: rhodecode/controllers/admin/permissions.py:79 -msgid "Disabled" +msgid "Allowed with automatic account activation" msgstr "" #: rhodecode/controllers/admin/permissions.py:77 @@ -431,154 +420,219 @@ msgstr "" #: rhodecode/controllers/admin/permissions.py:142 -msgid "error occurred during update of permissions" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:123 +msgid "Error occurred during update of permissions" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:127 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:162 +#: rhodecode/controllers/admin/repos.py:168 #, python-format -msgid "created repository %s from %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:166 +msgid "Created repository %s from %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:174 #, python-format -msgid "created repository %s" +msgid "Created repository %s" msgstr "" #: rhodecode/controllers/admin/repos.py:197 #, python-format -msgid "error occurred during creation of repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:302 +msgid "Error creating repository %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:266 +#, python-format +msgid "Repository %s updated successfully" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:284 +#, python-format +msgid "Error occurred during update of repository %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:311 rhodecode/controllers/api/api.py:877 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:314 rhodecode/controllers/api/api.py:879 +#, python-format +msgid "Deleted %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:319 +#, python-format +msgid "Deleted repository %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:322 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:327 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:365 +msgid "Repository permissions updated" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:384 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:350 -msgid "An error occurred during deletion of repository users groups" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:403 +msgid "An error occurred during deletion of repository user groups" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:421 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:438 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:425 +#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:485 +msgid "An error occurred during unlocking" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:476 +msgid "Unlocked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:479 +msgid "Locked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:481 +#, python-format +msgid "Repository has been %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:505 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:509 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301 +#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:527 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:449 +#: rhodecode/controllers/admin/repos.py:529 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:545 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:547 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:471 +#: rhodecode/controllers/admin/repos.py:551 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:136 +#: rhodecode/controllers/admin/repos.py:590 +msgid "An error occurred during creation of field" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:604 +msgid "An error occurred during removal of field" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:145 #, python-format -msgid "created repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:148 +msgid "Created repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:157 #, python-format -msgid "error occurred during creation of repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:205 -#, python-format -msgid "updated repos group %s" +msgid "Error occurred during creation of repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:214 +#: rhodecode/controllers/admin/repos_groups.py:286 +msgid "Cannot revoke permission for yourself as admin" msgstr "" #: rhodecode/controllers/admin/repos_groups.py:220 #, python-format -msgid "error occurred during update of repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:238 +msgid "Updated repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:235 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:253 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:246 +#: rhodecode/controllers/admin/repos_groups.py:260 #, python-format -msgid "removed repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:252 -msgid "Cannot delete this group it still contains subgroups" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:257 -#: rhodecode/controllers/admin/repos_groups.py:262 +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:266 +#, python-format +msgid "Removed repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:271 #, python-format -msgid "error occurred during deletion of repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:283 +msgid "Error occurred during deletion of repos group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:297 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:304 -msgid "An error occurred during deletion of group users groups" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:124 +#: rhodecode/controllers/admin/repos_groups.py:318 +msgid "An error occurred during deletion of group user groups" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:126 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:133 +#: rhodecode/controllers/admin/settings.py:135 msgid "Whoosh reindex task scheduled" msgstr "" -#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:166 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:170 #: rhodecode/controllers/admin/settings.py:301 -msgid "error occurred during updating application settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:209 +msgid "Error occurred during updating application settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:216 msgid "Updated visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:214 -msgid "error occurred during updating visualisation settings" +#: rhodecode/controllers/admin/settings.py:221 +msgid "Error occurred during updating visualisation settings" msgstr "" #: rhodecode/controllers/admin/settings.py:297 @@ -594,35 +648,35 @@ msgstr "" #: rhodecode/controllers/admin/settings.py:327 -msgid "error occurred during hook creation" +msgid "Error occurred during hook creation" msgstr "" #: rhodecode/controllers/admin/settings.py:346 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:408 +#: rhodecode/controllers/admin/settings.py:410 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:448 +#: rhodecode/controllers/admin/settings.py:452 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:463 +#: rhodecode/controllers/admin/settings.py:467 #: rhodecode/controllers/admin/users.py:198 #, python-format -msgid "error occurred during update of user %s" +msgid "Error occurred during update of user %s" msgstr "" #: rhodecode/controllers/admin/users.py:130 #, python-format -msgid "created user %s" +msgid "Created user %s" msgstr "" #: rhodecode/controllers/admin/users.py:142 #, python-format -msgid "error occurred during creation of user %s" +msgid "Error occurred during creation of user %s" msgstr "" #: rhodecode/controllers/admin/users.py:176 @@ -630,7 +684,7 @@ msgstr "" #: rhodecode/controllers/admin/users.py:214 -msgid "successfully deleted user" +msgid "Successfully deleted user" msgstr "" #: rhodecode/controllers/admin/users.py:219 @@ -658,7 +712,7 @@ msgstr "" #: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:279 +#: rhodecode/controllers/admin/users_groups.py:281 msgid "An error occurred during permissions saving" msgstr "" @@ -690,405 +744,444 @@ #: rhodecode/controllers/admin/users_groups.py:86 #, python-format -msgid "created users group %s" +msgid "Created user group %s" msgstr "" #: rhodecode/controllers/admin/users_groups.py:97 #, python-format -msgid "error occurred during creation of users group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:164 +msgid "Error occurred during creation of user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:166 #, python-format -msgid "updated users group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:186 +msgid "Updated user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:188 #, python-format -msgid "error occurred during update of users group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:203 -msgid "successfully deleted users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:208 -msgid "An error occurred during deletion of users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:257 -msgid "Granted 'repository create' permission to users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:262 -msgid "Revoked 'repository create' permission to users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:268 -msgid "Granted 'repository fork' permission to users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:273 -msgid "Revoked 'repository fork' permission to users group" -msgstr "" - -#: rhodecode/lib/auth.py:509 +msgid "Error occurred during update of user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:205 +msgid "Successfully deleted user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:210 +msgid "An error occurred during deletion of user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:259 +msgid "Granted 'repository create' permission to user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:264 +msgid "Revoked 'repository create' permission to user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:270 +msgid "Granted 'repository fork' permission to user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:275 +msgid "Revoked 'repository fork' permission to user group" +msgstr "" + +#: rhodecode/lib/auth.py:530 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:558 +#: rhodecode/lib/auth.py:579 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:599 +#: rhodecode/lib/auth.py:620 msgid "You need to be a signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:74 -msgid "binary file" -msgstr "" - -#: rhodecode/lib/diffs.py:90 +#: rhodecode/lib/diffs.py:66 +msgid "Binary file" +msgstr "" + +#: rhodecode/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:100 +#: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:374 +#: rhodecode/lib/helpers.py:394 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:506 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:509 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:530 +#: rhodecode/lib/helpers.py:547 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/helpers.py:533 +#: rhodecode/lib/helpers.py:550 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:563 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:589 -#, python-format -msgid "Show all combined changesets %s->%s" -msgstr "" - -#: rhodecode/lib/helpers.py:595 -msgid "compare view" -msgstr "" - #: rhodecode/lib/helpers.py:615 -msgid "and" -msgstr "" - -#: rhodecode/lib/helpers.py:616 #, python-format -msgid "%s more" -msgstr "" - -#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 -msgid "revisions" +msgid "Show all combined changesets %s->%s" +msgstr "" + +#: rhodecode/lib/helpers.py:621 +msgid "compare view" msgstr "" #: rhodecode/lib/helpers.py:641 +msgid "and" +msgstr "" + +#: rhodecode/lib/helpers.py:642 +#, python-format +msgid "%s more" +msgstr "" + +#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +msgid "revisions" +msgstr "" + +#: rhodecode/lib/helpers.py:667 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/helpers.py:658 -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 -#, python-format -msgid "Pull request #%s" -msgstr "" - -#: rhodecode/lib/helpers.py:664 -msgid "[deleted] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 -msgid "[created] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:668 -msgid "[created] repository as fork" -msgstr "" - -#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 -msgid "[forked] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 -msgid "[updated] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:674 -msgid "[delete] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:682 -msgid "[created] user" -msgstr "" - #: rhodecode/lib/helpers.py:684 -msgid "[updated] user" -msgstr "" - -#: rhodecode/lib/helpers.py:686 -msgid "[created] users group" -msgstr "" - -#: rhodecode/lib/helpers.py:688 -msgid "[updated] users group" +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#, python-format +msgid "Pull request #%s" msgstr "" #: rhodecode/lib/helpers.py:690 -msgid "[commented] on revision in repository" -msgstr "" - -#: rhodecode/lib/helpers.py:692 -msgid "[commented] on pull request for" +msgid "[deleted] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +msgid "[created] repository" msgstr "" #: rhodecode/lib/helpers.py:694 -msgid "[closed] pull request for" -msgstr "" - -#: rhodecode/lib/helpers.py:696 -msgid "[pushed] into" -msgstr "" - -#: rhodecode/lib/helpers.py:698 -msgid "[committed via RhodeCode] into repository" +msgid "[created] repository as fork" +msgstr "" + +#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +msgid "[forked] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +msgid "[updated] repository" msgstr "" #: rhodecode/lib/helpers.py:700 +msgid "[delete] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:708 +msgid "[created] user" +msgstr "" + +#: rhodecode/lib/helpers.py:710 +msgid "[updated] user" +msgstr "" + +#: rhodecode/lib/helpers.py:712 +msgid "[created] user group" +msgstr "" + +#: rhodecode/lib/helpers.py:714 +msgid "[updated] user group" +msgstr "" + +#: rhodecode/lib/helpers.py:716 +msgid "[commented] on revision in repository" +msgstr "" + +#: rhodecode/lib/helpers.py:718 +msgid "[commented] on pull request for" +msgstr "" + +#: rhodecode/lib/helpers.py:720 +msgid "[closed] pull request for" +msgstr "" + +#: rhodecode/lib/helpers.py:722 +msgid "[pushed] into" +msgstr "" + +#: rhodecode/lib/helpers.py:724 +msgid "[committed via RhodeCode] into repository" +msgstr "" + +#: rhodecode/lib/helpers.py:726 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:728 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:730 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:732 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:884 +#: rhodecode/lib/helpers.py:910 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:888 +#: rhodecode/lib/helpers.py:914 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1164 +#: rhodecode/lib/helpers.py:1198 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " "filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/lib/utils2.py:403 +#: rhodecode/lib/unionrepo.py:193 +msgid "cannot create new union repository" +msgstr "" + +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:404 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:405 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:406 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:407 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:408 +#: rhodecode/lib/utils2.py:416 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:424 +#: rhodecode/lib/utils2.py:432 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:426 -#, python-format -msgid "%s ago" -msgstr "" - -#: rhodecode/lib/utils2.py:428 -#, python-format -msgid "in %s and %s" -msgstr "" - -#: rhodecode/lib/utils2.py:431 -#, python-format -msgid "%s and %s ago" -msgstr "" - #: rhodecode/lib/utils2.py:434 +#, python-format +msgid "%s ago" +msgstr "" + +#: rhodecode/lib/utils2.py:436 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: rhodecode/lib/utils2.py:439 +#, python-format +msgid "%s and %s ago" +msgstr "" + +#: rhodecode/lib/utils2.py:442 msgid "just now" msgstr "" -#: rhodecode/lib/celerylib/tasks.py:270 -msgid "password reset link" -msgstr "" - #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 msgid "Repository no access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 msgid "Repository read access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 msgid "Repository write access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 msgid "Repository admin access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 msgid "Repositories Group no access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 msgid "Repositories Group read access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 msgid "Repositories Group write access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 msgid "Repositories Group admin access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 msgid "RhodeCode Administrator" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 msgid "Repository creation disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 msgid "Repository creation enabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 msgid "Repository forking disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 msgid "Repository forking enabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 msgid "Register disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 msgid "Not Reviewed" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 msgid "Approved" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 msgid "Rejected" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 msgid "Under Review" msgstr "" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:176 +#: rhodecode/model/comment.py:219 msgid "[Mention]" msgstr "" +#: rhodecode/model/db.py:1252 +msgid "top level" +msgstr "" + +#: rhodecode/model/db.py:1393 +msgid "Repository group no access" +msgstr "" + +#: rhodecode/model/db.py:1394 +msgid "Repository group read access" +msgstr "" + +#: rhodecode/model/db.py:1395 +msgid "Repository group write access" +msgstr "" + +#: rhodecode/model/db.py:1396 +msgid "Repository group admin access" +msgstr "" + #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "" @@ -1107,216 +1200,237 @@ msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:220 -#, python-format -msgid "commented on commit at %(when)s" -msgstr "" - -#: rhodecode/model/notification.py:221 -#, python-format -msgid "sent message at %(when)s" -msgstr "" - -#: rhodecode/model/notification.py:222 -#, python-format -msgid "mentioned you at %(when)s" -msgstr "" - -#: rhodecode/model/notification.py:223 -#, python-format -msgid "registered in RhodeCode at %(when)s" -msgstr "" - #: rhodecode/model/notification.py:224 #, python-format -msgid "opened new pull request at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "" #: rhodecode/model/notification.py:225 #, python-format -msgid "commented on pull request at %(when)s" -msgstr "" - -#: rhodecode/model/pull_request.py:100 +msgid "%(user)s sent message at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:226 +#, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:227 +#, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:228 #, python-format -msgid "%(user)s wants you to review pull request #%(pr_id)s" -msgstr "" - -#: rhodecode/model/scm.py:556 +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:229 +#, python-format +msgid "%(user)s commented on pull request at %(when)s" +msgstr "" + +#: rhodecode/model/pull_request.py:104 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" +msgstr "" + +#: rhodecode/model/scm.py:598 msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:231 -msgid "new user registration" -msgstr "" - -#: rhodecode/model/user.py:256 rhodecode/model/user.py:280 +#: rhodecode/model/user.py:232 +msgid "New user registration" +msgstr "" + +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:302 +#: rhodecode/model/user.py:303 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:308 +#: rhodecode/model/user.py:309 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38 +#: rhodecode/model/user.py:334 +msgid "Password reset link" +msgstr "" + +#: rhodecode/model/user.py:366 +msgid "Your new password" +msgstr "" + +#: rhodecode/model/user.py:367 +#, python-format +msgid "Your new RhodeCode password:%s" +msgstr "" + +#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:88 +#: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or " "dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/validators.py:116 +#: rhodecode/model/validators.py:117 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: rhodecode/model/validators.py:135 -msgid "Invalid users group name" -msgstr "" - #: rhodecode/model/validators.py:136 +msgid "Invalid user group name" +msgstr "" + +#: rhodecode/model/validators.py:137 #, python-format -msgid "Users group \"%(usersgroup)s\" already exists" -msgstr "" - -#: rhodecode/model/validators.py:138 +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + +#: rhodecode/model/validators.py:139 msgid "" -"users group name may only contain alphanumeric characters underscores, " -"periods or dashes and must begin with alphanumeric character" -msgstr "" - -#: rhodecode/model/validators.py:176 -msgid "Cannot assign this group as parent" +"user group name may only contain alphanumeric characters underscores, periods" +" or dashes and must begin with alphanumeric character" msgstr "" #: rhodecode/model/validators.py:177 +msgid "Cannot assign this group as parent" +msgstr "" + +#: rhodecode/model/validators.py:178 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:179 +#: rhodecode/model/validators.py:180 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:238 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: rhodecode/model/validators.py:252 +#: rhodecode/model/validators.py:253 msgid "Passwords do not match" msgstr "" -#: rhodecode/model/validators.py:269 -msgid "invalid password" -msgstr "" - #: rhodecode/model/validators.py:270 -msgid "invalid user name" +msgid "invalid password" msgstr "" #: rhodecode/model/validators.py:271 +msgid "invalid user name" +msgstr "" + +#: rhodecode/model/validators.py:272 msgid "Your account is disabled" msgstr "" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: rhodecode/model/validators.py:317 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - #: rhodecode/model/validators.py:318 #, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + +#: rhodecode/model/validators.py:319 +#, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:320 +#: rhodecode/model/validators.py:321 #, python-format -msgid "Repositories group with name \"%(repo)s\" already exists" -msgstr "" - -#: rhodecode/model/validators.py:433 +msgid "Repository group with name \"%(repo)s\" already exists" +msgstr "" + +#: rhodecode/model/validators.py:438 msgid "invalid clone url" msgstr "" -#: rhodecode/model/validators.py:434 +#: rhodecode/model/validators.py:439 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:459 +#: rhodecode/model/validators.py:464 msgid "Fork have to be the same type as parent" msgstr "" -#: rhodecode/model/validators.py:474 +#: rhodecode/model/validators.py:479 msgid "You don't have permissions to create repository in this group" msgstr "" -#: rhodecode/model/validators.py:501 +#: rhodecode/model/validators.py:481 +msgid "no permission to create repository in root location" +msgstr "" + +#: rhodecode/model/validators.py:518 msgid "You don't have permissions to create a group in this location" msgstr "" -#: rhodecode/model/validators.py:540 -msgid "This username or users group name is not valid" -msgstr "" - -#: rhodecode/model/validators.py:636 +#: rhodecode/model/validators.py:557 +msgid "This username or user group name is not valid" +msgstr "" + +#: rhodecode/model/validators.py:650 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:651 +#: rhodecode/model/validators.py:665 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:671 +#: rhodecode/model/validators.py:685 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:708 +#: rhodecode/model/validators.py:722 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name of " "the attribute that is equivalent to \"username\"" msgstr "" -#: rhodecode/model/validators.py:727 +#: rhodecode/model/validators.py:735 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:759 +#: rhodecode/model/validators.py:767 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:760 +#: rhodecode/model/validators.py:768 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/templates/index.html:3 +#: rhodecode/model/validators.py:800 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "" @@ -1325,208 +1439,211 @@ #: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/bookmarks/bookmarks.html:9 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:9 -#: rhodecode/templates/journal/journal.html:49 -#: rhodecode/templates/journal/journal.html:50 -#: rhodecode/templates/tags/tags.html:10 +#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:47 rhodecode/templates/tags/tags.html:9 msgid "quick filter..." msgstr "" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:239 msgid "repositories" msgstr "" -#: rhodecode/templates/index_base.html:14 rhodecode/templates/index_base.html:17 +#: rhodecode/templates/index_base.html:13 rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 #: rhodecode/templates/admin/repos/repos.html:21 msgid "Add repository" msgstr "" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:15 rhodecode/templates/index_base.html:20 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 +msgid "Add group" +msgstr "" + +#: rhodecode/templates/index_base.html:27 msgid "Edit group" msgstr "" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:36 rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 +#: rhodecode/templates/index_base.html:40 rhodecode/templates/index_base.html:140 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "Group name" msgstr "" -#: rhodecode/templates/index_base.html:37 rhodecode/templates/index_base.html:79 +#: rhodecode/templates/index_base.html:41 rhodecode/templates/index_base.html:83 #: rhodecode/templates/index_base.html:142 rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:270 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:73 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/forks/fork.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.html:47 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 -msgid "Repositories group" -msgstr "" - -#: rhodecode/templates/index_base.html:78 rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:271 -#: rhodecode/templates/admin/permissions/permissions.html:117 +#: rhodecode/templates/index_base.html:51 +#: rhodecode/templates/admin/permissions/permissions.html:55 +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 +#: rhodecode/templates/forks/fork.html:47 +msgid "Repository group" +msgstr "" + +#: rhodecode/templates/index_base.html:82 rhodecode/templates/index_base.html:178 +#: rhodecode/templates/index_base.html:268 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:71 -#: rhodecode/templates/admin/users/user_edit.html:200 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:211 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 -#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/admin/users/user_edit_my_account.html:172 +#: rhodecode/templates/base/perms_summary.html:14 +#: rhodecode/templates/bookmarks/bookmarks.html:34 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:201 -#: rhodecode/templates/journal/journal.html:305 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:132 -#: rhodecode/templates/tags/tags.html:51 rhodecode/templates/tags/tags_data.html:6 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/summary/summary.html:55 +#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/tags/tags.html:48 rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "" -#: rhodecode/templates/index_base.html:80 -msgid "Last change" -msgstr "" - -#: rhodecode/templates/index_base.html:81 rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:276 -#: rhodecode/templates/admin/repos/repos.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:213 -#: rhodecode/templates/journal/journal.html:203 -#: rhodecode/templates/journal/journal.html:307 -msgid "Tip" -msgstr "" - -#: rhodecode/templates/index_base.html:82 rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:278 -#: rhodecode/templates/admin/repos/repo_edit.html:121 -#: rhodecode/templates/admin/repos/repos.html:76 -msgid "Owner" -msgstr "" - -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "" - #: rhodecode/templates/index_base.html:84 +msgid "Last change" +msgstr "" + +#: rhodecode/templates/index_base.html:85 rhodecode/templates/index_base.html:183 +#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account.html:174 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:298 +msgid "Tip" +msgstr "" + +#: rhodecode/templates/index_base.html:86 rhodecode/templates/index_base.html:185 +#: rhodecode/templates/index_base.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:121 +#: rhodecode/templates/admin/repos/repos.html:76 +msgid "Owner" +msgstr "" + +#: rhodecode/templates/index_base.html:87 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:171 rhodecode/templates/index_base.html:211 -#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/index_base.html:171 rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:296 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:235 +#: rhodecode/templates/admin/users/user_edit_my_account.html:196 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:225 -#: rhodecode/templates/journal/journal.html:329 -#: rhodecode/templates/tags/tags.html:77 +#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/branches/branches.html:73 +#: rhodecode/templates/journal/journal.html:217 +#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:172 rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:301 +#: rhodecode/templates/index_base.html:172 rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:297 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:236 +#: rhodecode/templates/admin/users/user_edit_my_account.html:197 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:226 -#: rhodecode/templates/journal/journal.html:330 -#: rhodecode/templates/tags/tags.html:78 +#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/branches/branches.html:74 +#: rhodecode/templates/journal/journal.html:218 +#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:181 rhodecode/templates/index_base.html:274 +#: rhodecode/templates/index_base.html:181 rhodecode/templates/index_base.html:271 msgid "Last Change" msgstr "" -#: rhodecode/templates/index_base.html:213 rhodecode/templates/index_base.html:302 +#: rhodecode/templates/index_base.html:211 #: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:237 +#: rhodecode/templates/admin/users/user_edit_my_account.html:198 #: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:227 -#: rhodecode/templates/journal/journal.html:331 -#: rhodecode/templates/tags/tags.html:79 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:219 +#: rhodecode/templates/journal/journal.html:322 +#: rhodecode/templates/tags/tags.html:76 msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:214 rhodecode/templates/index_base.html:303 +#: rhodecode/templates/index_base.html:212 rhodecode/templates/index_base.html:299 #: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:238 +#: rhodecode/templates/admin/users/user_edit_my_account.html:199 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:228 -#: rhodecode/templates/journal/journal.html:332 -#: rhodecode/templates/tags/tags.html:80 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:220 +#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:215 rhodecode/templates/index_base.html:304 +#: rhodecode/templates/index_base.html:213 rhodecode/templates/index_base.html:300 #: rhodecode/templates/admin/repos/repos.html:101 -#: rhodecode/templates/admin/users/user_edit_my_account.html:105 -#: rhodecode/templates/admin/users/user_edit_my_account.html:239 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +#: rhodecode/templates/admin/users/user_edit_my_account.html:200 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:229 -#: rhodecode/templates/journal/journal.html:333 -#: rhodecode/templates/tags/tags.html:81 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:221 +#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "" -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 -msgid "Sign In" +#: rhodecode/templates/index_base.html:298 +msgid "No repositories found." +msgstr "" + +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +msgid "Log In" msgstr "" #: rhodecode/templates/login.html:21 -msgid "Sign In to" +#, python-format +msgid "Log In to %s" msgstr "" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:54 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:89 -#: rhodecode/templates/summary/summary.html:131 +#: rhodecode/templates/admin/users/user_edit.html:57 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 +#: rhodecode/templates/admin/users/users.html:77 +#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "" #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:98 +#: rhodecode/templates/base/base.html:212 msgid "Password" msgstr "" @@ -1534,16 +1651,20 @@ msgid "Remember me" msgstr "" +#: rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 msgid "Don't have an account ?" msgstr "" #: rhodecode/templates/password_reset.html:5 -msgid "Reset your password" +msgid "Password Reset" msgstr "" #: rhodecode/templates/password_reset.html:11 @@ -1576,23 +1697,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57 +#: rhodecode/templates/admin/users/user_edit.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "First Name" msgstr "" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:103 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66 +#: rhodecode/templates/admin/users/user_edit.html:106 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 msgid "Last Name" msgstr "" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75 -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/admin/users/user_edit.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/summary/summary.html:125 msgid "Email" msgstr "" @@ -1604,50 +1725,38 @@ msgid "Your account must wait for activation by administrator" msgstr "" -#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:76 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/summary/summary.html:77 msgid "Private repository" msgstr "" -#: rhodecode/templates/repo_switcher_list.html:16 +#: rhodecode/templates/repo_switcher_list.html:12 +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/summary/summary.html:79 msgid "Public repository" msgstr "" -#: rhodecode/templates/switch_to_list.html:3 -#: rhodecode/templates/branches/branches.html:14 -msgid "branches" -msgstr "" - #: rhodecode/templates/switch_to_list.html:10 #: rhodecode/templates/branches/branches_data.html:57 msgid "There are no branches yet" msgstr "" -#: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:15 -msgid "tags" -msgstr "" - #: rhodecode/templates/switch_to_list.html:22 #: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "" -#: rhodecode/templates/switch_to_list.html:28 -#: rhodecode/templates/bookmarks/bookmarks.html:15 -msgid "bookmarks" -msgstr "" - #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 msgid "There are no bookmarks yet" msgstr "" #: rhodecode/templates/admin/admin.html:5 rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/base/base.html:68 msgid "Admin journal" msgstr "" @@ -1670,9 +1779,12 @@ #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account.html:215 -#: rhodecode/templates/journal/journal.html:205 -#: rhodecode/templates/journal/journal.html:309 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:87 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:300 msgid "Action" msgstr "" @@ -1682,11 +1794,11 @@ msgstr "" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/tags/tags.html:52 rhodecode/templates/tags/tags_data.html:7 +#: rhodecode/templates/tags/tags.html:49 rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "" @@ -1704,6 +1816,7 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:11 +#: rhodecode/templates/base/base.html:75 msgid "Defaults" msgstr "" @@ -1716,8 +1829,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 +#: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1745,7 +1857,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 msgid "Enable locking" msgstr "" @@ -1757,14 +1869,17 @@ #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 #: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:148 +#: rhodecode/templates/admin/repos/repo_edit.html:173 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:137 -#: rhodecode/templates/admin/users/user_edit.html:182 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users/user_edit.html:140 +#: rhodecode/templates/admin/users/user_edit.html:185 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "" @@ -1773,7 +1888,9 @@ msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:11 -msgid "Ldap" +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:74 +msgid "LDAP" msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:28 @@ -1854,7 +1971,7 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:272 rhodecode/templates/base/base.html:274 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 msgid "Pull requests" msgstr "" @@ -1872,6 +1989,7 @@ msgstr "" #: rhodecode/templates/admin/notifications/show_notification.html:9 +#: rhodecode/templates/base/base.html:241 msgid "Notifications" msgstr "" @@ -1880,11 +1998,12 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63 -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:165 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/users/user_edit.html:150 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:86 +#: rhodecode/templates/base/base.html:73 msgid "Permissions" msgstr "" @@ -1898,30 +2017,21 @@ #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" -"All default permissions on each repository will be reset to choosen " +"All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will be " "lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -msgid "overwrite existing settings" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:55 -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" +msgid "Overwrite existing settings" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:62 msgid "" -"All default permissions on each repository group will be reset to choosen " -"permission, note that all custom default permission on repositories group " -"will be lost" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups will" +" be lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 @@ -1937,22 +2047,23 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:209 -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:179 -#: rhodecode/templates/admin/settings/settings.html:269 -#: rhodecode/templates/admin/users/user_edit.html:138 -#: rhodecode/templates/admin/users/user_edit.html:183 -#: rhodecode/templates/admin/users/user_edit.html:286 -#: rhodecode/templates/admin/users/user_edit.html:334 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84 +#: rhodecode/templates/admin/permissions/permissions.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:149 +#: rhodecode/templates/admin/repos/repo_edit.html:174 +#: rhodecode/templates/admin/repos/repo_edit.html:388 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:278 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users/user_edit.html:283 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:95 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:110 msgid "Reset" msgstr "" @@ -1960,104 +2071,70 @@ msgid "Default User Permissions" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:111 -#: rhodecode/templates/admin/users/user_edit.html:194 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -msgid "Nothing here yet" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:118 -#: rhodecode/templates/admin/users/user_edit.html:201 -#: rhodecode/templates/admin/users/user_edit_my_account.html:61 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 -msgid "Permission" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:119 -#: rhodecode/templates/admin/users/user_edit.html:202 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 -msgid "Edit Permission" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:149 -#: rhodecode/templates/admin/permissions/permissions.html:151 -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:232 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:116 -#: rhodecode/templates/data_table/_dt_elements.html:117 -msgid "edit" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:168 -#: rhodecode/templates/admin/users/user_edit.html:295 +#: rhodecode/templates/admin/permissions/permissions.html:113 +#: rhodecode/templates/admin/users/user_edit.html:244 msgid "Allowed IP addresses" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:182 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 -#: rhodecode/templates/admin/users/user_edit.html:263 -#: rhodecode/templates/admin/users/user_edit.html:308 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/admin/permissions/permissions.html:127 +#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 +#: rhodecode/templates/admin/users/user_edit.html:212 +#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users_groups/users_groups.html:46 #: rhodecode/templates/data_table/_dt_elements.html:122 #: rhodecode/templates/data_table/_dt_elements.html:130 msgid "delete" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:183 -#: rhodecode/templates/admin/users/user_edit.html:309 +#: rhodecode/templates/admin/permissions/permissions.html:128 +#: rhodecode/templates/admin/users/user_edit.html:258 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:189 -#: rhodecode/templates/admin/users/user_edit.html:315 +#: rhodecode/templates/admin/permissions/permissions.html:134 +#: rhodecode/templates/admin/users/user_edit.html:264 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:200 -#: rhodecode/templates/admin/users/user_edit.html:326 +#: rhodecode/templates/admin/permissions/permissions.html:145 +#: rhodecode/templates/admin/users/user_edit.html:275 msgid "New ip address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:208 -#: rhodecode/templates/admin/users/user_edit.html:285 -#: rhodecode/templates/admin/users/user_edit.html:333 +#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:387 +#: rhodecode/templates/admin/users/user_edit.html:234 +#: rhodecode/templates/admin/users/user_edit.html:282 msgid "Add" msgstr "" -#: rhodecode/templates/admin/repos/repo_add.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -#: rhodecode/templates/base/base.html:154 +#: rhodecode/templates/admin/repos/repo_add.html:12 +#: rhodecode/templates/admin/repos/repo_add.html:16 +#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 +#: rhodecode/templates/base/base.html:263 msgid "Repositories" msgstr "" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +#: rhodecode/templates/admin/repos/repo_add.html:19 +msgid "Add new" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:104 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Clone from" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:24 #: rhodecode/templates/admin/repos/repo_edit.html:44 -#: rhodecode/templates/settings/repo_settings.html:43 msgid "Optional http[s] url from which repository should be cloned." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/forks/fork.html:54 +#: rhodecode/templates/forks/fork.html:51 msgid "Optionaly select a group to put this repository into." msgstr "" @@ -2067,44 +2144,39 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 -#: rhodecode/templates/forks/fork.html:41 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/forks/fork.html:38 msgid "Landing revision" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 -#: rhodecode/templates/forks/fork.html:45 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 -#: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:70 +#: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -msgid "add" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 -msgid "add new repository" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:5 +#: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:12 +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:11 +#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/summary/summary.html:212 +msgid "Settings" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:40 -#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 msgid "Optional select a group to put this repository into." msgstr "" @@ -2112,161 +2184,203 @@ msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:152 -msgid "Administration" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:155 +#: rhodecode/templates/admin/repos/repo_edit.html:184 +msgid "Advanced settings" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Reset current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Confirm to remove current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:195 msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:171 -msgid "Remote" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:175 -msgid "Pull changes from remote location" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:175 -msgid "Confirm to pull changes from remote side" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:186 -msgid "Cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:190 -msgid "Invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:190 -msgid "Confirm to invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:193 -msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:198 -msgid "List of cached values" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Prefix" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:202 -msgid "Key" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:203 -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:121 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" +msgid "Remote" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:207 +msgid "Pull changes from remote location" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:207 +msgid "Confirm to pull changes from remote side" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:306 rhodecode/templates/base/base.html:308 -#: rhodecode/templates/base/base.html:310 +msgid "Cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Confirm to invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:225 +msgid "" +"Manually invalidate cache for this repository. On first access repository " +"will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:230 +msgid "List of cached values" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:233 +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:234 +msgid "Key" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:124 +#: rhodecode/templates/admin/users/users.html:84 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +#: rhodecode/templates/admin/users_groups/users_groups.html:36 +msgid "Active" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:250 +#: rhodecode/templates/base/base.html:280 rhodecode/templates/base/base.html:281 msgid "Public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "Remove from public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:226 +#: rhodecode/templates/admin/repos/repo_edit.html:258 msgid "Add to public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:231 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "" "All actions made on this repository will be accessible to everyone in public " "journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:238 +#: rhodecode/templates/admin/repos/repo_edit.html:270 msgid "Locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Confirm to unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:246 -msgid "Confirm to lock repository" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:247 -msgid "Repository is not locked" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:252 -msgid "Force locking on repository. Works only when anonymous access is disabled" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:259 -msgid "Set as fork of" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:264 -msgid "set" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:268 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:274 -#: rhodecode/templates/changeset/changeset_file_comment.html:41 -msgid "Delete" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +msgid "Confirm to lock repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:279 +msgid "Repository is not locked" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:284 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:291 +msgid "Set as fork of" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:296 +msgid "set" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:300 +msgid "Manually set this repository as a fork of another from the list" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:306 +#: rhodecode/templates/changeset/changeset_file_comment.html:41 +msgid "Delete" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Remove this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Confirm to delete this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:282 -#: rhodecode/templates/settings/repo_settings.html:119 +#: rhodecode/templates/admin/repos/repo_edit.html:317 +#, python-format +msgid "this repository has %s fork" +msgid_plural "this repository has %s forks" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/admin/repos/repo_edit.html:318 +msgid "Detach forks" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:319 +msgid "Delete forks" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:322 msgid "" "This repository will be renamed in a special way in order to be unaccesible " -"for RhodeCode and VCS systems. If you need fully delete it from file system " -"please do it manually" +"for RhodeCode and VCS systems. If you need to fully delete it from file " +"system please do it manually" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:336 +msgid "Extra fields" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:348 +#, python-format +msgid "Confirm to delete this field: %s" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:362 +msgid "New field key" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgid "New field label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:373 +msgid "Enter short label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:379 +msgid "New field description" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgid "Enter description of a field" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 @@ -2286,8 +2400,6 @@ #: 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:85 -#: rhodecode/templates/base/base.html:235 msgid "admin" msgstr "" @@ -2297,73 +2409,58 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 -#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:19 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 msgid "default" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 msgid "revoke" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 msgid "Add another member" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 msgid "Failed to remove user" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 -msgid "Failed to remove users group" +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 +msgid "Failed to remove user group" msgstr "" #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 msgid "apply to children" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "" "Set or revoke permission to all children of that group, including non-private" " repositories and other groups" msgstr "" +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#, python-format +msgid "%s Group Dashboard" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 -#: rhodecode/templates/base/base.html:128 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 rhodecode/templates/tags/tags.html:11 msgid "Home" msgstr "" @@ -2372,76 +2469,78 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repos group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 -msgid "Repos groups" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 -msgid "add new repos group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55 +msgid "Add repository group" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 +#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 +msgid "Repository groups" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 +msgid "Add new repository group" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 msgid "Group parent" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/users/user_add.html:94 -#: rhodecode/templates/admin/users_groups/users_group_add.html:49 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:149 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59 msgid "save" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repos group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 -msgid "edit repos group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26 -msgid "Add new child group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 +msgid "Edit repository group" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 +#, python-format +msgid "Edit repository group %s" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 +msgid "Add child group" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other " "groups and repositories inside" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repositories groups administration" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -msgid "Add new group" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +msgid "Repository groups administration" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +msgid "Edit" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/base/perms_summary.html:29 +#: rhodecode/templates/base/perms_summary.html:48 +#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/data_table/_dt_elements.html:116 +#: rhodecode/templates/data_table/_dt_elements.html:117 +msgid "edit" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68 -msgid "There are no repositories groups yet" +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 +msgid "There are no repository groups yet" msgstr "" #: rhodecode/templates/admin/settings/hooks.html:5 @@ -2449,12 +2548,6 @@ msgid "Settings administration" msgstr "" -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:13 -msgid "Settings" -msgstr "" - #: rhodecode/templates/admin/settings/hooks.html:24 msgid "Built in hooks - read only" msgstr "" @@ -2471,205 +2564,210 @@ msgid "Failed to remove hook" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:24 +#: rhodecode/templates/admin/settings/settings.html:26 msgid "Remap and rescan repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:32 -msgid "rescan option" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:38 +#: rhodecode/templates/admin/settings/settings.html:34 +msgid "Rescan option" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:40 msgid "" "In case a repository was deleted from filesystem and there are leftovers in " "the database check this option to scan obsolete data in database and remove " "it." msgstr "" -#: rhodecode/templates/admin/settings/settings.html:39 -msgid "destroy old data" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:41 +msgid "Destroy old data" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:43 msgid "" "Rescan repositories location for new repositories. Also deletes obsolete if " "`destroy` flag is checked " msgstr "" -#: rhodecode/templates/admin/settings/settings.html:46 +#: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:52 +#: rhodecode/templates/admin/settings/settings.html:54 msgid "Whoosh indexing" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:60 -msgid "index build option" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:65 -msgid "build from scratch" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:71 +#: rhodecode/templates/admin/settings/settings.html:62 +msgid "Index build option" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:67 +msgid "Build from scratch" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:77 +#: rhodecode/templates/admin/settings/settings.html:79 msgid "Global application settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:86 -msgid "Application name" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:95 -msgid "Realm text" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:104 -msgid "GA code" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/settings/settings.html:268 +#: rhodecode/templates/admin/settings/settings.html:88 +msgid "Site branding" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:97 +msgid "HTTP authentication realm" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:106 +msgid "Google Analytics code" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:114 +#: rhodecode/templates/admin/settings/settings.html:186 +#: rhodecode/templates/admin/settings/settings.html:277 msgid "Save settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:119 +#: rhodecode/templates/admin/settings/settings.html:121 msgid "Visualisation settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:129 msgid "General" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:132 +#: rhodecode/templates/admin/settings/settings.html:134 msgid "Use lightweight dashboard" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:140 +msgid "Use repository extra fields" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:147 msgid "Icons" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:156 msgid "Show private repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:163 msgid "Meta-Tagging" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:168 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:195 msgid "VCS settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:201 -msgid "require ssl for vcs operations" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:209 +msgid "Require SSL for vcs operations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:211 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will " "return HTTP Error 406: Not Acceptable" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:217 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:214 -msgid "Update repository after push (hg update)" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:218 -msgid "Show repository size after push" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:222 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: rhodecode/templates/admin/settings/settings.html:226 -msgid "Log user pull commands" +msgid "Show repository size after push" msgstr "" #: rhodecode/templates/admin/settings/settings.html:230 -msgid "advanced setup" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:235 +msgid "Log user push commands" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:234 +msgid "Log user pull commands" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:238 +msgid "Advanced setup" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Mercurial Extensions" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:240 -msgid "largefiles extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:244 -msgid "hgsubversion extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:246 +#: rhodecode/templates/admin/settings/settings.html:248 +msgid "Enable largefiles extension" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:252 +msgid "Enable hgsubversion extension" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:254 msgid "" -"Requires hgsubversion library installed. Allows clonning from svn remote " +"Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:256 +#: rhodecode/templates/admin/settings/settings.html:264 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:261 +#: rhodecode/templates/admin/settings/settings.html:269 msgid "" "This a crucial application setting. If you are really sure you need to change" " this, you must restart application in order to make this setting take " "effect. Click this label to unlock." msgstr "" -#: rhodecode/templates/admin/settings/settings.html:262 -#: rhodecode/templates/base/base.html:227 -msgid "unlock" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:263 +#: rhodecode/templates/admin/settings/settings.html:270 +#: rhodecode/templates/base/base.html:131 +msgid "Unlock" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:272 msgid "" "Location where repositories are stored. After changing this value a restart, " "and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:283 +#: rhodecode/templates/admin/settings/settings.html:292 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:291 +#: rhodecode/templates/admin/settings/settings.html:300 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:299 -msgid "Send" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:305 -msgid "System Info and Packages" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:308 -msgid "show" +msgid "Send" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:314 +msgid "System Info and Packages" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:317 +#: rhodecode/templates/changelog/changelog.html:42 +msgid "Show" msgstr "" #: rhodecode/templates/admin/users/user_add.html:5 @@ -2678,11 +2776,13 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 +#: rhodecode/templates/base/base.html:71 msgid "Users" msgstr "" #: rhodecode/templates/admin/users/user_add.html:12 -msgid "add new user" +#: rhodecode/templates/admin/users/users.html:23 +msgid "Add new user" msgstr "" #: rhodecode/templates/admin/users/user_add.html:50 @@ -2693,6 +2793,12 @@ msgid "Edit user" msgstr "" +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#, python-format +msgid "Edit %s" +msgstr "" + #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 msgid "Change your avatar at" @@ -2708,30 +2814,31 @@ msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:48 -msgid "Your IP" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit.html:67 +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 +msgid "Current IP" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:76 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39 +#: rhodecode/templates/admin/users/user_edit.html:79 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:85 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48 +#: rhodecode/templates/admin/users/user_edit.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "New password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:158 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:160 +#: rhodecode/templates/admin/users/user_edit.html:163 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2739,31 +2846,31 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:169 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:177 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:251 +#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/users/user_edit.html:213 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "New email address" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:130 +#: rhodecode/templates/base/base.html:242 msgid "My account" msgstr "" @@ -2776,7 +2883,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:57 +#: rhodecode/templates/journal/journal.html:54 msgid "My repos" msgstr "" @@ -2784,30 +2891,43 @@ msgid "My pull requests" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/journal/journal.html:61 -msgid "Add repo" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 +msgid "Show closed pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 +#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_show.html:27 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +msgid "Closed" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 msgid "Confirm to delete this pull request" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 +msgid "Nothing here yet" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "" @@ -2817,67 +2937,51 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:241 msgid "users" msgstr "" -#: rhodecode/templates/admin/users/users.html:23 -msgid "Add new user" -msgstr "" - -#: rhodecode/templates/admin/users/users.html:77 -msgid "username" -msgstr "" - #: rhodecode/templates/admin/users/users.html:80 -msgid "firstname" +msgid "Firstname" msgstr "" #: rhodecode/templates/admin/users/users.html:81 -msgid "lastname" +msgid "Lastname" msgstr "" #: rhodecode/templates/admin/users/users.html:82 -msgid "last login" -msgstr "" - -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" -msgstr "" - -#: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:244 -msgid "ldap" +msgid "Last login" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -msgid "Add users group" +msgid "Add user group" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -msgid "Users groups" +#: rhodecode/templates/admin/users_groups/users_groups.html:11 +#: rhodecode/templates/base/base.html:72 +msgid "User groups" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -msgid "add new users group" +#: rhodecode/templates/admin/users_groups/users_groups.html:25 +msgid "Add new user group" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit users group" +msgid "Edit user group" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -msgid "UsersGroups" +msgid "UserGroups" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "Members" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -msgid "Choosen group members" +msgid "Chosen group members" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 @@ -2892,247 +2996,241 @@ msgid "Add all elements" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 msgid "Group members" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 msgid "No members yet" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 -msgid "Permissions defined for this group" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 -msgid "No permissions set yet" -msgstr "" - #: rhodecode/templates/admin/users_groups/users_groups.html:5 -msgid "Users groups administration" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_groups.html:23 -msgid "Add new user group" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_groups.html:32 -msgid "group name" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -#: rhodecode/templates/base/root.html:46 -msgid "members" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_groups.html:45 +msgid "User groups administration" +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_groups.html:47 #, python-format -msgid "Confirm to delete this users group: %s" -msgstr "" - -#: rhodecode/templates/base/base.html:41 +msgid "Confirm to delete this user group: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:42 msgid "Submit a bug" msgstr "" -#: rhodecode/templates/base/base.html:76 -msgid "Not logged in" -msgstr "" - -#: rhodecode/templates/base/base.html:83 -msgid "Login to your account" -msgstr "" - -#: rhodecode/templates/base/base.html:106 -msgid "Forgot password ?" -msgstr "" - -#: rhodecode/templates/base/base.html:113 -msgid "Log In" -msgstr "" - -#: rhodecode/templates/base/base.html:124 -msgid "Inbox" -msgstr "" - -#: rhodecode/templates/base/base.html:129 rhodecode/templates/base/base.html:297 -#: rhodecode/templates/base/base.html:299 rhodecode/templates/base/base.html:301 -#: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/public_journal.html:4 -msgid "Journal" -msgstr "" - -#: rhodecode/templates/base/base.html:131 -msgid "Log Out" -msgstr "" - -#: rhodecode/templates/base/base.html:150 -msgid "Switch repository" -msgstr "" - -#: rhodecode/templates/base/base.html:152 -msgid "Products" -msgstr "" - -#: rhodecode/templates/base/base.html:158 rhodecode/templates/base/base.html:189 -#: rhodecode/templates/base/root.html:47 -msgid "loading..." -msgstr "" - -#: rhodecode/templates/base/base.html:166 rhodecode/templates/base/base.html:168 -#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/base/base.html:108 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 +#: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: rhodecode/templates/base/base.html:174 rhodecode/templates/base/base.html:176 -#: rhodecode/templates/base/base.html:178 -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/base/base.html:109 +#: rhodecode/templates/changelog/changelog.html:11 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "" -#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/base.html:184 -#: rhodecode/templates/base/base.html:186 -msgid "Switch to" -msgstr "" - -#: rhodecode/templates/base/base.html:193 rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:110 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:12 msgid "Files" msgstr "" -#: rhodecode/templates/base/base.html:201 rhodecode/templates/base/base.html:205 +#: rhodecode/templates/base/base.html:112 +msgid "Switch To" +msgstr "" + +#: rhodecode/templates/base/base.html:114 rhodecode/templates/base/base.html:267 +msgid "loading..." +msgstr "" + +#: rhodecode/templates/base/base.html:118 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.html:210 rhodecode/templates/base/base.html:212 -msgid "repository settings" -msgstr "" - -#: rhodecode/templates/base/base.html:216 +#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/base/base.html:126 +msgid "Lightweight changelog" +msgstr "" + +#: rhodecode/templates/base/base.html:127 rhodecode/templates/base/base.html:287 +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:54 +msgid "Search" +msgstr "" + +#: rhodecode/templates/base/base.html:133 +msgid "Lock" +msgstr "" + +#: rhodecode/templates/base/base.html:141 +msgid "Follow" +msgstr "" + +#: rhodecode/templates/base/base.html:142 +msgid "Unfollow" +msgstr "" + +#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/forks/fork.html:13 -msgid "fork" -msgstr "" - -#: rhodecode/templates/base/base.html:218 -#: rhodecode/templates/changelog/changelog.html:43 -msgid "open new pull request" -msgstr "" - -#: rhodecode/templates/base/base.html:221 -msgid "compare fork" -msgstr "" - -#: rhodecode/templates/base/base.html:223 -msgid "search" -msgstr "" - -#: rhodecode/templates/base/base.html:229 -msgid "lock" -msgstr "" - -#: rhodecode/templates/base/base.html:240 -msgid "repositories groups" -msgstr "" - -#: rhodecode/templates/base/base.html:242 -msgid "users groups" +#: rhodecode/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: rhodecode/templates/base/base.html:147 +msgid "Create Pull Request" +msgstr "" + +#: rhodecode/templates/base/base.html:153 +msgid "Show Pull Requests" +msgstr "" + +#: rhodecode/templates/base/base.html:153 +msgid "Pull Requests" +msgstr "" + +#: rhodecode/templates/base/base.html:190 +msgid "Not logged in" +msgstr "" + +#: rhodecode/templates/base/base.html:197 +msgid "Login to your account" +msgstr "" + +#: rhodecode/templates/base/base.html:220 +msgid "Forgot password ?" msgstr "" #: rhodecode/templates/base/base.html:243 -msgid "permissions" -msgstr "" - -#: rhodecode/templates/base/base.html:245 -msgid "defaults" -msgstr "" - -#: rhodecode/templates/base/base.html:246 -msgid "settings" -msgstr "" - -#: rhodecode/templates/base/base.html:256 rhodecode/templates/base/base.html:258 -msgid "Followers" -msgstr "" - -#: rhodecode/templates/base/base.html:264 rhodecode/templates/base/base.html:266 -msgid "Forks" -msgstr "" - -#: rhodecode/templates/base/base.html:315 rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 rhodecode/templates/search/search.html:52 -msgid "Search" -msgstr "" - -#: rhodecode/templates/base/root.html:42 -msgid "add another comment" +msgid "Log Out" +msgstr "" + +#: rhodecode/templates/base/base.html:262 +msgid "Switch repository" +msgstr "" + +#: rhodecode/templates/base/base.html:274 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "" + +#: rhodecode/templates/base/base.html:286 +msgid "Search in repositories" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:8 +msgid "No permissions defined yet" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:15 +msgid "Permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:16 +msgid "Edit Permission" msgstr "" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/data_table/_dt_elements.html:140 -#: rhodecode/templates/summary/summary.html:57 -msgid "Stop following this repository" +msgid "Add another comment" msgstr "" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:61 -msgid "Start following this repository" +#: rhodecode/templates/data_table/_dt_elements.html:140 +msgid "Stop following this repository" msgstr "" #: rhodecode/templates/base/root.html:45 +msgid "Start following this repository" +msgstr "" + +#: rhodecode/templates/base/root.html:46 msgid "Group" msgstr "" +#: rhodecode/templates/base/root.html:47 +msgid "members" +msgstr "" + #: rhodecode/templates/base/root.html:48 -msgid "search truncated" +#: rhodecode/templates/pullrequests/pullrequest.html:181 +msgid "Loading ..." msgstr "" #: rhodecode/templates/base/root.html:49 -msgid "no matching files" +msgid "Search truncated" msgstr "" #: rhodecode/templates/base/root.html:50 -msgid "Open new pull request" +msgid "No matching files" msgstr "" #: rhodecode/templates/base/root.html:51 -msgid "Open new pull request for selected changesets" +#: rhodecode/templates/changelog/changelog.html:36 +msgid "Open new pull request" msgstr "" #: rhodecode/templates/base/root.html:52 -msgid "Show selected changes __S -> __E" +msgid "Open new pull request for selected changesets" msgstr "" #: rhodecode/templates/base/root.html:53 +msgid "Show selected changesets __S -> __E" +msgstr "" + +#: rhodecode/templates/base/root.html:54 +msgid "Show selected changeset __S" +msgstr "" + +#: rhodecode/templates/base/root.html:55 msgid "Selection link" msgstr "" +#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/changeset/diff_block.html:8 +msgid "Collapse diff" +msgstr "" + +#: rhodecode/templates/base/root.html:57 +msgid "Expand diff" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/tags/tags.html:54 rhodecode/templates/tags/tags_data.html:8 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/tags/tags.html:51 rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks.html:38 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/tags/tags.html:55 rhodecode/templates/tags/tags_data.html:9 +#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/tags/tags.html:52 rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "" @@ -3141,15 +3239,13 @@ msgid "%s Branches" msgstr "" -#: rhodecode/templates/branches/branches.html:29 +#: rhodecode/templates/branches/branches.html:26 msgid "Compare branches" msgstr "" -#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches.html:53 #: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/compare/compare_diff.html:5 -#: rhodecode/templates/compare/compare_diff.html:13 -#: rhodecode/templates/tags/tags.html:57 rhodecode/templates/tags/tags_data.html:10 +#: rhodecode/templates/tags/tags.html:54 rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "" @@ -3158,116 +3254,79 @@ msgid "%s Changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/changelog/changelog.html:11 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/changelog/changelog.html:30 msgid "Clear selection" msgstr "" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 #: rhodecode/templates/forks/forks_data.html:19 #, python-format -msgid "compare fork with %s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:40 +msgid "Compare fork with %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:33 msgid "Compare fork with parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:49 -msgid "Show" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:74 -#: rhodecode/templates/summary/summary.html:375 -msgid "show more" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:78 -msgid "Affected number of files, click to show more details" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:65 -#: rhodecode/templates/changeset/changeset_file_comment.html:20 -#: rhodecode/templates/changeset/changeset_range.html:46 -msgid "Changeset status" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:94 -#: rhodecode/templates/shortlog/shortlog_data.html:20 +#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/summary/summary.html:404 +msgid "Show more" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changeset/changeset_range.html:86 #, python-format -msgid "Click to open associated pull request #%s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:104 -msgid "Parent" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:42 -msgid "No parents" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:115 +msgid "Bookmark %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:95 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset_range.html:92 +#, python-format +msgid "Tag %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:100 #: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:79 -msgid "merge" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:109 -#: rhodecode/templates/changeset/changeset_range.html:82 -#: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_add.html:33 -#: rhodecode/templates/files/files_edit.html:33 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -msgid "branch" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:124 -#: rhodecode/templates/changeset/changeset_range.html:88 -msgid "bookmark" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:114 -#: rhodecode/templates/changeset/changeset_range.html:94 -msgid "tag" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:302 +#: rhodecode/templates/changeset/changeset_range.html:80 +#, python-format +msgid "Branch %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:258 msgid "There are no changes yet" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:94 -msgid "removed" +#: rhodecode/templates/changeset/changeset.html:91 +msgid "Removed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:95 -msgid "changed" +#: rhodecode/templates/changeset/changeset.html:92 +msgid "Changed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:96 -msgid "added" +#: rhodecode/templates/changeset/changeset.html:93 +msgid "Added" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:98 -#: rhodecode/templates/changeset/changeset.html:99 -#: rhodecode/templates/changeset/changeset.html:100 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changeset/changeset.html:97 #, python-format -msgid "affected %s files" +msgid "Affected %s files" msgstr "" #: rhodecode/templates/changeset/changeset.html:6 @@ -3275,29 +3334,35 @@ msgid "%s Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:14 -msgid "Changeset" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:52 +#: rhodecode/templates/changeset/changeset.html:39 +msgid "No parents" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:49 msgid "No children" msgstr "" -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/diff_block.html:20 -msgid "raw diff" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:71 -msgid "patch diff" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:72 -#: rhodecode/templates/changeset/diff_block.html:21 -msgid "download diff" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:62 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:44 +msgid "Changeset status" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/diff_block.html:23 +msgid "Raw diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:68 +msgid "Patch diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:69 +#: rhodecode/templates/changeset/diff_block.html:24 +msgid "Download diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "%d comment" @@ -3305,7 +3370,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "(%d inline)" @@ -3313,32 +3378,53 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:122 -#: rhodecode/templates/compare/compare_diff.html:44 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:77 +msgid "merge" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/compare/compare_diff.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:124 -#: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/pullrequests/pullrequest_show.html:96 +#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/compare/compare_diff.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Showing a huge diff might take some time and resources" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Show full diff" +msgstr "" + #: rhodecode/templates/changeset/changeset_file_comment.html:30 #, python-format -msgid "Status from pull request %s" +msgid "Status change on pull request #%s" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:32 #, python-format -msgid "Comment from pull request %s" +msgid "Comment on pull request #%s" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:57 @@ -3350,24 +3436,23 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:139 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:142 +#: rhodecode/templates/changeset/changeset_file_comment.html:141 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:162 +#: rhodecode/templates/changeset/changeset_file_comment.html:161 msgid "Comment" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:75 -#: rhodecode/templates/changeset/changeset_file_comment.html:86 -msgid "Hide" +msgid "Cancel" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:82 @@ -3378,19 +3463,15 @@ msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:137 -msgid "Leave a comment" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "Check this to change current status of code-review for this changeset" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "change status" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:164 +#: rhodecode/templates/changeset/changeset_file_comment.html:86 +msgid "Hide" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:143 +msgid "Change status" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:163 msgid "Comment and close" msgstr "" @@ -3399,69 +3480,74 @@ msgid "%s Changesets" msgstr "" -#: rhodecode/templates/changeset/changeset_range.html:29 -#: rhodecode/templates/compare/compare_diff.html:29 -msgid "Compare View" -msgstr "" - -#: rhodecode/templates/changeset/changeset_range.html:29 -msgid "Show combined compare" -msgstr "" - -#: rhodecode/templates/changeset/changeset_range.html:54 +#: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:19 -msgid "show full diff for this file" -msgstr "" - -#: rhodecode/templates/changeset/diff_block.html:27 -msgid "show inline comments" -msgstr "" - -#: rhodecode/templates/compare/compare_cs.html:5 +#: rhodecode/templates/changeset/diff_block.html:22 +msgid "Show full diff for this file" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:30 +msgid "Show inline comments" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:55 +msgid "Show file at latest version in this repo" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:56 +msgid "Show file at initial version in this repo" +msgstr "" + +#: rhodecode/templates/compare/compare_cs.html:4 msgid "No changesets" msgstr "" -#: rhodecode/templates/compare/compare_diff.html:37 -#: rhodecode/templates/pullrequests/pullrequest_show.html:87 +#: rhodecode/templates/compare/compare_cs.html:32 +msgid "Ancestor" +msgstr "" + +#: rhodecode/templates/compare/compare_diff.html:5 +#, python-format +msgid "%s Compare" +msgstr "" + +#: rhodecode/templates/compare/compare_diff.html:9 +msgid "Compare revisions" +msgstr "" + +#: rhodecode/templates/compare/compare_diff.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:106 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/compare/compare_diff.html:52 -#: rhodecode/templates/pullrequests/pullrequest_show.html:102 +#: rhodecode/templates/compare/compare_diff.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:121 msgid "No files" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 -msgid "Fork" +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +msgid "confirm to show potentially huge diff" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:54 -#: rhodecode/templates/summary/summary.html:77 +#: rhodecode/templates/summary/summary.html:69 msgid "Mercurial repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:56 -#: rhodecode/templates/summary/summary.html:80 +#: rhodecode/templates/summary/summary.html:72 msgid "Git repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:63 -#: rhodecode/templates/summary/summary.html:87 -msgid "public repository" -msgstr "" - #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/summary/summary.html:96 -#: rhodecode/templates/summary/summary.html:97 -msgid "Fork of" +#, python-format +msgid "Fork of %s" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:88 @@ -3490,8 +3576,22 @@ msgid "Confirm to delete this user: %s" msgstr "" -#: rhodecode/templates/email_templates/changeset_comment.html:10 -msgid "New status$" +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:15 +msgid "New status" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:11 +#: rhodecode/templates/email_templates/pull_request_comment.html:9 +msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:14 +msgid "Repo" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:16 +msgid "desc" msgstr "" #: rhodecode/templates/email_templates/main.html:8 @@ -3499,19 +3599,20 @@ msgstr "" #: rhodecode/templates/email_templates/password_reset.html:4 -msgid "Hello" +#, python-format +msgid "Hello %s" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.html:5 +msgid "We received a request to create a new password for your account." msgstr "" #: rhodecode/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.html:8 msgid "You can generate it by clicking following URL" msgstr "" -#: rhodecode/templates/email_templates/password_reset.html:12 -msgid "If you didn't request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:11 +msgid "If you did not request new password please ignore this email." msgstr "" #: rhodecode/templates/email_templates/pull_request.html:4 @@ -3520,33 +3621,28 @@ msgstr "" #: rhodecode/templates/email_templates/pull_request.html:5 -msgid "title" +msgid "View this pull request here" msgstr "" #: rhodecode/templates/email_templates/pull_request.html:6 -#: rhodecode/templates/pullrequests/pullrequest.html:115 -msgid "description" +msgid "title" msgstr "" #: rhodecode/templates/email_templates/pull_request.html:7 -msgid "View this pull request here" +msgid "description" msgstr "" #: rhodecode/templates/email_templates/pull_request.html:12 msgid "revisions for reviewing" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:3 #, python-format -msgid "User %s commented on pull request #%s for repository %s" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:10 -msgid "New status" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:14 -msgid "View this comment here" +msgid "Pull request #%s for repository %s" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:13 +msgid "Closing pull request with status" msgstr "" #: rhodecode/templates/email_templates/registration.html:4 @@ -3557,106 +3653,104 @@ msgid "View this user here" msgstr "" -#: rhodecode/templates/errors/error_document.html:46 +#: rhodecode/templates/errors/error_document.html:55 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "" #: rhodecode/templates/files/file_diff.html:4 #, python-format -msgid "%s File diff" -msgstr "" - -#: rhodecode/templates/files/file_diff.html:12 +msgid "%s File Diff" +msgstr "" + +#: rhodecode/templates/files/file_diff.html:8 msgid "File diff" msgstr "" -#: rhodecode/templates/files/files.html:4 rhodecode/templates/files/files.html:74 +#: rhodecode/templates/files/files.html:4 rhodecode/templates/files/files.html:76 #, python-format -msgid "%s files" -msgstr "" - -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:351 -msgid "files" +msgid "%s Files" +msgstr "" + +#: rhodecode/templates/files/files.html:30 +#: rhodecode/templates/files/files_add.html:31 +#: rhodecode/templates/files/files_edit.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +msgid "Branch" msgstr "" #: rhodecode/templates/files/files_add.html:4 -#: rhodecode/templates/files/files_edit.html:4 #, python-format -msgid "%s Edit file" +msgid "%s Files Add" msgstr "" #: rhodecode/templates/files/files_add.html:19 -msgid "add file" -msgstr "" - -#: rhodecode/templates/files/files_add.html:40 +msgid "Add file" +msgstr "" + +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:78 msgid "Add new file" msgstr "" -#: rhodecode/templates/files/files_add.html:45 +#: rhodecode/templates/files/files_add.html:43 msgid "File Name" msgstr "" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:56 msgid "or" msgstr "" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:54 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:52 msgid "Upload file" msgstr "" -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:56 msgid "Create new file" msgstr "" -#: rhodecode/templates/files/files_add.html:63 -#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_add.html:61 +#: rhodecode/templates/files/files_edit.html:37 #: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: rhodecode/templates/files/files_add.html:67 +#: rhodecode/templates/files/files_add.html:65 msgid "use / to separate directories" msgstr "" -#: rhodecode/templates/files/files_add.html:77 -#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 #: rhodecode/templates/shortlog/shortlog_data.html:6 -msgid "commit message" -msgstr "" - -#: rhodecode/templates/files/files_add.html:81 -#: rhodecode/templates/files/files_edit.html:67 +msgid "Commit message" +msgstr "" + +#: rhodecode/templates/files/files_add.html:79 +#: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "" #: rhodecode/templates/files/files_browser.html:13 -msgid "view" +msgid "View" msgstr "" #: rhodecode/templates/files/files_browser.html:14 -msgid "previous revision" +msgid "Previous revision" msgstr "" #: rhodecode/templates/files/files_browser.html:16 -msgid "next revision" +msgid "Next revision" msgstr "" #: rhodecode/templates/files/files_browser.html:23 -msgid "follow current branch" +msgid "Follow current branch" msgstr "" #: rhodecode/templates/files/files_browser.html:27 -msgid "search file list" -msgstr "" - -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -msgid "add new file" +msgid "Search file list" msgstr "" #: rhodecode/templates/files/files_browser.html:35 @@ -3683,31 +3777,36 @@ msgid "Last committer" msgstr "" +#: rhodecode/templates/files/files_edit.html:4 +#, python-format +msgid "%s Files Edit" +msgstr "" + #: rhodecode/templates/files/files_edit.html:19 -msgid "edit file" +msgid "Edit file" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:47 +#: rhodecode/templates/files/files_source.html:23 +msgid "Show annotation" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:48 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:55 +msgid "Show as raw" msgstr "" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:23 -msgid "show annotation" -msgstr "" - -#: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:25 -#: rhodecode/templates/files/files_source.html:55 -msgid "show as raw" -msgstr "" - -#: rhodecode/templates/files/files_edit.html:51 #: rhodecode/templates/files/files_source.html:26 -msgid "download as raw" -msgstr "" - -#: rhodecode/templates/files/files_edit.html:54 -msgid "source" -msgstr "" - -#: rhodecode/templates/files/files_edit.html:59 +msgid "Download as raw" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:52 +msgid "Source" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" msgstr "" @@ -3716,15 +3815,15 @@ msgstr "" #: rhodecode/templates/files/files_history_box.html:9 -msgid "diff to revision" +msgid "Diff to revision" msgstr "" #: rhodecode/templates/files/files_history_box.html:10 -msgid "show at revision" +msgid "Show at revision" msgstr "" #: rhodecode/templates/files/files_history_box.html:11 -msgid "show full history" +msgid "Show full history" msgstr "" #: rhodecode/templates/files/files_history_box.html:16 @@ -3739,16 +3838,16 @@ msgstr "" #: rhodecode/templates/files/files_source.html:21 -msgid "show source" +msgid "Show source" msgstr "" #: rhodecode/templates/files/files_source.html:29 #, python-format -msgid "edit on branch:%s" +msgid "Edit on branch:%s" msgstr "" #: rhodecode/templates/files/files_source.html:31 -msgid "edit on branch:?" +msgid "Edit on branch:?" msgstr "" #: rhodecode/templates/files/files_source.html:31 @@ -3781,8 +3880,10 @@ msgid "%s Followers" msgstr "" -#: rhodecode/templates/followers/followers.html:13 -msgid "followers" +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:184 +msgid "Followers" msgstr "" #: rhodecode/templates/followers/followers_data.html:12 @@ -3794,32 +3895,32 @@ msgid "%s Fork" msgstr "" -#: rhodecode/templates/forks/fork.html:31 +#: rhodecode/templates/forks/fork.html:28 msgid "Fork name" msgstr "" -#: rhodecode/templates/forks/fork.html:68 +#: rhodecode/templates/forks/fork.html:65 msgid "Private" msgstr "" -#: rhodecode/templates/forks/fork.html:77 +#: rhodecode/templates/forks/fork.html:74 msgid "Copy permissions" msgstr "" -#: rhodecode/templates/forks/fork.html:81 +#: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" msgstr "" -#: rhodecode/templates/forks/fork.html:86 +#: rhodecode/templates/forks/fork.html:84 msgid "Update after clone" msgstr "" -#: rhodecode/templates/forks/fork.html:90 +#: rhodecode/templates/forks/fork.html:88 msgid "Checkout source after making a clone" msgstr "" -#: rhodecode/templates/forks/fork.html:94 -msgid "fork this repository" +#: rhodecode/templates/forks/fork.html:93 +msgid "Fork this repository" msgstr "" #: rhodecode/templates/forks/forks.html:5 @@ -3827,16 +3928,14 @@ msgid "%s Forks" msgstr "" -#: rhodecode/templates/forks/forks.html:13 -msgid "forks" +#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/summary/summary.html:189 +#: rhodecode/templates/summary/summary.html:190 +msgid "Forks" msgstr "" #: rhodecode/templates/forks/forks_data.html:17 -msgid "forked" -msgstr "" - -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" +msgid "Forked" msgstr "" #: rhodecode/templates/forks/forks_data.html:42 @@ -3852,21 +3951,15 @@ msgstr "" #: rhodecode/templates/journal/journal.html:32 -#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" #: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 -msgid "RSS feed" -msgstr "" - -#: rhodecode/templates/journal/journal.html:38 -#: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:51 msgid "Watched" msgstr "" @@ -3874,6 +3967,11 @@ msgid "No entries yet" msgstr "" +#: rhodecode/templates/journal/public_journal.html:4 +#: rhodecode/templates/journal/public_journal.html:21 +msgid "Public Journal" +msgstr "" + #: rhodecode/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "" @@ -3882,151 +3980,126 @@ msgid "RSS public journal feed" msgstr "" -#: rhodecode/templates/journal/public_journal.html:21 -msgid "Public Journal" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest.html:4 -#: rhodecode/templates/pullrequests/pullrequest.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:54 -msgid "refresh overview" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:52 msgid "Detailed compare view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:118 +#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:145 +#: rhodecode/templates/pullrequests/pullrequest.html:77 msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:97 +#: rhodecode/templates/pullrequests/pullrequest.html:83 msgid "Create new pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest.html:92 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:123 +#: rhodecode/templates/pullrequests/pullrequest.html:109 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "Closed %s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 #, python-format -msgid "with status %s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:31 -msgid "Status" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:36 +msgid "%s Pull Request #%s" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +msgid "Review status" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 -msgid "pull request was reviewed by all reviewers" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:59 +msgid "Pull request was reviewed by all reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Origin repository" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:83 +#: rhodecode/templates/pullrequests/pullrequest_show.html:102 msgid "Compare view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "reviewer" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:164 +msgid "Add or remove reviewer to this pull request." +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:168 +msgid "Save changes" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -msgid "all pull requests" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 -msgid "All pull requests" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 -msgid "Closed" +#, python-format +msgid "%s Pull Requests" msgstr "" #: rhodecode/templates/search/search.html:6 -#, python-format -msgid "Search \"%s\" in repository: %s" +msgid "Search repository" msgstr "" #: rhodecode/templates/search/search.html:8 -#, python-format -msgid "Search \"%s\" in all repositories" -msgstr "" - -#: rhodecode/templates/search/search.html:12 -#: rhodecode/templates/search/search.html:32 -#, python-format -msgid "Search in repository: %s" -msgstr "" - -#: rhodecode/templates/search/search.html:14 -#: rhodecode/templates/search/search.html:34 +#: rhodecode/templates/search/search.html:16 msgid "Search in all repositories" msgstr "" -#: rhodecode/templates/search/search.html:48 +#: rhodecode/templates/search/search.html:50 msgid "Search term" msgstr "" -#: rhodecode/templates/search/search.html:60 +#: rhodecode/templates/search/search.html:62 msgid "Search in" msgstr "" -#: rhodecode/templates/search/search.html:63 -msgid "File contents" -msgstr "" - -#: rhodecode/templates/search/search.html:64 -msgid "Commit messages" -msgstr "" - #: rhodecode/templates/search/search.html:65 +msgid "File contents" +msgstr "" + +#: rhodecode/templates/search/search.html:66 +msgid "Commit messages" +msgstr "" + +#: rhodecode/templates/search/search.html:67 msgid "File names" msgstr "" @@ -4036,39 +4109,23 @@ msgid "Permission denied" msgstr "" -#: rhodecode/templates/settings/repo_settings.html:5 -#, python-format -msgid "%s Settings" -msgstr "" - -#: rhodecode/templates/settings/repo_settings.html:102 -msgid "Delete repository" -msgstr "" - -#: rhodecode/templates/settings/repo_settings.html:109 -msgid "Remove repo" -msgstr "" - #: rhodecode/templates/shortlog/shortlog.html:5 #, python-format -msgid "%s Shortlog" -msgstr "" - +msgid "%s Lightweight Changelog" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog.html:11 #: rhodecode/templates/shortlog/shortlog.html:15 -#: rhodecode/templates/shortlog/shortlog.html:19 -msgid "shortlog" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" +msgid "Lightweight Changelog" msgstr "" #: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "age" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" +msgid "Age" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:20 +#, python-format +msgid "Click to open associated pull request #%s" msgstr "" #: rhodecode/templates/shortlog/shortlog_data.html:75 @@ -4088,156 +4145,165 @@ msgid "%s Summary" msgstr "" -#: rhodecode/templates/summary/summary.html:12 -msgid "summary" -msgstr "" - -#: rhodecode/templates/summary/summary.html:20 +#: rhodecode/templates/summary/summary.html:16 #, python-format -msgid "repo %s ATOM feed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:21 +msgid "%s ATOM feed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:17 #, python-format -msgid "repo %s RSS feed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:49 -#: rhodecode/templates/summary/summary.html:52 -msgid "ATOM" -msgstr "" - -#: rhodecode/templates/summary/summary.html:70 +msgid "%s RSS feed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:62 #, python-format msgid "Repository locked by %s" msgstr "" -#: rhodecode/templates/summary/summary.html:72 +#: rhodecode/templates/summary/summary.html:64 msgid "Repository unlocked" msgstr "" -#: rhodecode/templates/summary/summary.html:91 +#: rhodecode/templates/summary/summary.html:83 #, python-format msgid "Non changable ID %s" msgstr "" +#: rhodecode/templates/summary/summary.html:88 +msgid "Public" +msgstr "" + +#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:89 +msgid "Fork of" +msgstr "" + #: rhodecode/templates/summary/summary.html:96 -msgid "public" -msgstr "" - -#: rhodecode/templates/summary/summary.html:104 -msgid "remote clone" -msgstr "" - -#: rhodecode/templates/summary/summary.html:125 +msgid "Remote clone" +msgstr "" + +#: rhodecode/templates/summary/summary.html:117 msgid "Contact" msgstr "" -#: rhodecode/templates/summary/summary.html:139 +#: rhodecode/templates/summary/summary.html:131 msgid "Clone url" msgstr "" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:136 msgid "Show by Name" msgstr "" +#: rhodecode/templates/summary/summary.html:137 +msgid "Show by ID" +msgstr "" + #: rhodecode/templates/summary/summary.html:143 -msgid "Show by ID" +msgid "Trending files" msgstr "" #: rhodecode/templates/summary/summary.html:151 -msgid "Trending files" +#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" msgstr "" #: rhodecode/templates/summary/summary.html:159 -#: rhodecode/templates/summary/summary.html:175 -#: rhodecode/templates/summary/summary.html:203 -msgid "enable" -msgstr "" - -#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "" +#: rhodecode/templates/summary/summary.html:163 +msgid "There are no downloads yet" +msgstr "" + +#: rhodecode/templates/summary/summary.html:165 +msgid "Downloads are disabled for this repository" +msgstr "" + #: rhodecode/templates/summary/summary.html:171 -msgid "There are no downloads yet" -msgstr "" - -#: rhodecode/templates/summary/summary.html:173 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: rhodecode/templates/summary/summary.html:179 msgid "Download as zip" msgstr "" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:195 +#: rhodecode/templates/summary/summary.html:197 +msgid "Repository Size" +msgstr "" + +#: rhodecode/templates/summary/summary.html:204 +#: rhodecode/templates/summary/summary.html:206 +msgid "Feed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:206 +#: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:227 -msgid "Shortlog" -msgstr "" - -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:256 +msgid "Latest changes" +msgstr "" + +#: rhodecode/templates/summary/summary.html:258 msgid "Quick start" msgstr "" -#: rhodecode/templates/summary/summary.html:243 +#: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:246 +#: rhodecode/templates/summary/summary.html:275 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:304 +#: rhodecode/templates/summary/summary.html:333 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:661 +#: rhodecode/templates/summary/summary.html:380 +msgid "files" +msgstr "" + +#: rhodecode/templates/summary/summary.html:690 msgid "commits" msgstr "" -#: rhodecode/templates/summary/summary.html:662 +#: rhodecode/templates/summary/summary.html:691 msgid "files added" msgstr "" -#: rhodecode/templates/summary/summary.html:663 +#: rhodecode/templates/summary/summary.html:692 msgid "files changed" msgstr "" -#: rhodecode/templates/summary/summary.html:664 +#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "" -#: rhodecode/templates/summary/summary.html:667 +#: rhodecode/templates/summary/summary.html:695 msgid "commit" msgstr "" -#: rhodecode/templates/summary/summary.html:668 +#: rhodecode/templates/summary/summary.html:696 msgid "file added" msgstr "" -#: rhodecode/templates/summary/summary.html:669 +#: rhodecode/templates/summary/summary.html:697 msgid "file changed" msgstr "" -#: rhodecode/templates/summary/summary.html:670 +#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "" @@ -4246,7 +4312,7 @@ msgid "%s Tags" msgstr "" -#: rhodecode/templates/tags/tags.html:29 +#: rhodecode/templates/tags/tags.html:26 msgid "Compare tags" msgstr ""
--- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Fri Apr 05 14:09:23 2013 +0200 +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Fri Apr 05 19:21:52 2013 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.4.4\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-01-28 00:24+0100\n" +"POT-Creation-Date: 2013-04-05 10:17-0700\n" "PO-Revision-Date: 2012-12-14 12:57+0800\n" "Last-Translator: xpol <xpolife@gmail.com>\n" "Language-Team: mikespook\n" @@ -23,11 +23,13 @@ msgstr "所有分支" #: rhodecode/controllers/changeset.py:83 -msgid "show white space" +#, fuzzy +msgid "Show white space" msgstr "显示空白字符" #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 -msgid "ignore white space" +#, fuzzy +msgid "Ignore white space" msgstr "忽略空白字符" #: rhodecode/controllers/changeset.py:163 @@ -36,7 +38,7 @@ msgstr "%s行上下文" #: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:416 +#: rhodecode/controllers/pullrequests.py:438 #, python-format msgid "Status change -> %s" msgstr "状态修改为%s" @@ -48,8 +50,8 @@ "not allowed" msgstr "不允许修改已关闭拉取请求的修订集状态" -#: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:121 +#: rhodecode/controllers/compare.py:74 +#: rhodecode/controllers/pullrequests.py:167 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "还没有修订集" @@ -91,107 +93,118 @@ msgstr "%s %s订阅" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:137 -#: rhodecode/templates/changeset/changeset.html:149 -#: rhodecode/templates/compare/compare_diff.html:62 -#: rhodecode/templates/compare/compare_diff.html:73 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 -#: rhodecode/templates/pullrequests/pullrequest_show.html:171 +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Changeset was too big and was cut off..." msgstr "修订集太大已被截断......" -#: rhodecode/controllers/feed.py:92 -msgid "commited on" +#: rhodecode/controllers/feed.py:91 +#, fuzzy, python-format +msgid "%s committed on %s" msgstr "提交于" -#: rhodecode/controllers/files.py:86 -msgid "click here to add new file" +#: rhodecode/controllers/files.py:88 +#, fuzzy +msgid "Click here to add new file" msgstr "点击此处添加新文件" -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/files.py:89 #, python-format msgid "There are no files yet %s" msgstr "还没有文件%s" -#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338 +#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "版本库由%s于%s锁定" -#: rhodecode/controllers/files.py:281 +#: rhodecode/controllers/files.py:279 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:295 +#: rhodecode/controllers/files.py:293 #, fuzzy, python-format msgid "Edited file %s via RhodeCode" msgstr "通过RhodeCode修改了%s" -#: rhodecode/controllers/files.py:311 +#: rhodecode/controllers/files.py:309 msgid "No changes" msgstr "无变更" -#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384 +#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390 +#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: rhodecode/controllers/files.py:350 +#: rhodecode/controllers/files.py:347 #, fuzzy msgid "Added file via RhodeCode" msgstr "通过RhodeCode添加了%s" -#: rhodecode/controllers/files.py:370 +#: rhodecode/controllers/files.py:364 msgid "No content" msgstr "无内容" -#: rhodecode/controllers/files.py:374 +#: rhodecode/controllers/files.py:368 msgid "No filename" msgstr "无文件名" -#: rhodecode/controllers/files.py:416 -msgid "downloads disabled" +#: rhodecode/controllers/files.py:372 +msgid "Location must be relative path and must not contain .. in path" +msgstr "" + +#: rhodecode/controllers/files.py:420 +#, fuzzy +msgid "Downloads disabled" msgstr "禁止下载" -#: rhodecode/controllers/files.py:427 +#: rhodecode/controllers/files.py:431 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: rhodecode/controllers/files.py:429 +#: rhodecode/controllers/files.py:433 msgid "Empty repository" msgstr "空版本库" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:435 msgid "Unknown archive type" msgstr "未知包类型" -#: rhodecode/controllers/files.py:576 -#: rhodecode/templates/changeset/changeset_range.html:13 -#: rhodecode/templates/changeset/changeset_range.html:31 +#: rhodecode/controllers/files.py:617 +#: rhodecode/templates/changeset/changeset_range.html:9 msgid "Changesets" msgstr "修订集" -#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564 +#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 +#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78 -#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575 +#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 +#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "标签" -#: rhodecode/controllers/forks.py:165 -#, python-format -msgid "forked %s repository as %s" +#: rhodecode/controllers/forks.py:175 +#, fuzzy, python-format +msgid "Forked repository %s as %s" msgstr "版本库%s被复刻到%s" -#: rhodecode/controllers/forks.py:179 +#: rhodecode/controllers/forks.py:189 #, python-format msgid "An error occurred during repository forking %s" msgstr "在复刻版本库%s的时候发生错误" @@ -201,50 +214,72 @@ msgstr "公共日志" #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 -#: rhodecode/templates/base/base.html:238 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "日志" -#: rhodecode/controllers/login.py:142 -msgid "You have successfully registered into rhodecode" +#: rhodecode/controllers/login.py:138 +#, fuzzy +msgid "You have successfully registered into RhodeCode" msgstr "成功注册到RhodeCode" -#: rhodecode/controllers/login.py:163 +#: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" msgstr "密码重置链接已经发送" -#: rhodecode/controllers/login.py:183 +#: rhodecode/controllers/login.py:179 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "密码已经成功重置，新密码已经发送到你的邮箱" -#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570 +#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/email_templates/changeset_comment.html:15 +msgid "Changeset" +msgstr "修订集" + +#: rhodecode/controllers/pullrequests.py:128 +msgid "Special" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:129 +#, fuzzy +msgid "Peer branches" +msgstr "分支" + +#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "书签" -#: rhodecode/controllers/pullrequests.py:190 +#: rhodecode/controllers/pullrequests.py:228 msgid "Pull request requires a title with min. 3 chars" msgstr "拉取请求的标题至少3个字符" -#: rhodecode/controllers/pullrequests.py:192 -msgid "error during creation of pull request" +#: rhodecode/controllers/pullrequests.py:230 +#, fuzzy +msgid "Error creating pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:224 +#: rhodecode/controllers/pullrequests.py:251 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: rhodecode/controllers/pullrequests.py:227 +#: rhodecode/controllers/pullrequests.py:254 msgid "Error occurred during sending pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:260 +#: rhodecode/controllers/pullrequests.py:287 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: rhodecode/controllers/pullrequests.py:451 +#: rhodecode/controllers/pullrequests.py:441 +msgid "Closing with" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:478 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "只能以批准或者驳回的状态关闭拉取请求" @@ -260,55 +295,12 @@ msgid "An error occurred during this search operation" msgstr "在搜索操作中发生异常" -#: rhodecode/controllers/settings.py:120 -#: rhodecode/controllers/admin/repos.py:254 -#, python-format -msgid "Repository %s updated successfully" -msgstr "版本库%s成功更新" - -#: rhodecode/controllers/settings.py:138 -#: rhodecode/controllers/admin/repos.py:272 -#, python-format -msgid "error occurred during update of repository %s" -msgstr "在更新版本库%s的时候发生错误" - -#: rhodecode/controllers/settings.py:163 -#: rhodecode/controllers/admin/repos.py:297 -#, python-format -msgid "deleted repository %s" -msgstr "已经删除版本库%s" - -#: rhodecode/controllers/settings.py:167 -#: rhodecode/controllers/admin/repos.py:307 -#: rhodecode/controllers/admin/repos.py:313 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "在删除%s的时候发生错误" - -#: rhodecode/controllers/settings.py:186 -msgid "unlocked" -msgstr "未锁" - -#: rhodecode/controllers/settings.py:189 -msgid "locked" -msgstr "已锁" - -#: rhodecode/controllers/settings.py:191 -#, python-format -msgid "Repository has been %s" -msgstr "版本库已被%s" - -#: rhodecode/controllers/settings.py:195 -#: rhodecode/controllers/admin/repos.py:405 -msgid "An error occurred during unlocking" -msgstr "解锁时发生错误" - -#: rhodecode/controllers/summary.py:140 +#: rhodecode/controllers/summary.py:141 msgid "No data loaded yet" msgstr "数据未加载" -#: rhodecode/controllers/summary.py:144 -#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/controllers/summary.py:147 +#: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" @@ -317,7 +309,8 @@ msgstr "默认设置已经成功更新" #: rhodecode/controllers/admin/defaults.py:110 -msgid "error occurred during update of defaults" +#, fuzzy +msgid "Error occurred during update of defaults" msgstr "更新默认设置时发生错误" #: rhodecode/controllers/admin/ldap_settings.py:50 @@ -373,7 +366,8 @@ msgstr "无法启用LDAP。缺失“python-ldap”库。" #: rhodecode/controllers/admin/ldap_settings.py:147 -msgid "error occurred during update of ldap settings" +#, fuzzy +msgid "Error occurred during update of ldap settings" msgstr "更新LDAP设置时发生错误" #: rhodecode/controllers/admin/permissions.py:60 @@ -396,45 +390,46 @@ #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 -#: rhodecode/templates/admin/repos/repo_add.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:9 +#: rhodecode/templates/admin/repos/repo_add.html:10 +#: rhodecode/templates/admin/repos/repo_add.html:14 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:133 #: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/admin/users/users.html:85 #: 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:203 -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 +#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:300 msgid "Admin" msgstr "管理" #: rhodecode/controllers/admin/permissions.py:70 -msgid "disabled" -msgstr "禁用" - -#: rhodecode/controllers/admin/permissions.py:72 -msgid "allowed with manual account activation" -msgstr "允许手工启用帐号" - -#: rhodecode/controllers/admin/permissions.py:74 -msgid "allowed with automatic account activation" -msgstr "允许自动启用帐号" - #: rhodecode/controllers/admin/permissions.py:76 #: rhodecode/controllers/admin/permissions.py:79 msgid "Disabled" msgstr "停用" +#: rhodecode/controllers/admin/permissions.py:72 +#, fuzzy +msgid "Allowed with manual account activation" +msgstr "允许手工启用帐号" + +#: rhodecode/controllers/admin/permissions.py:74 +#, fuzzy +msgid "Allowed with automatic account activation" +msgstr "允许自动启用帐号" + #: rhodecode/controllers/admin/permissions.py:77 #: rhodecode/controllers/admin/permissions.py:80 msgid "Enabled" @@ -445,154 +440,231 @@ msgstr "成功更新默认权限" #: rhodecode/controllers/admin/permissions.py:142 -msgid "error occurred during update of permissions" +#, fuzzy +msgid "Error occurred during update of permissions" msgstr "更新权限时发生错误" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:127 msgid "--REMOVE FORK--" msgstr "-- 移除复刻 --" -#: rhodecode/controllers/admin/repos.py:162 -#, python-format -msgid "created repository %s from %s" +#: rhodecode/controllers/admin/repos.py:168 +#, fuzzy, python-format +msgid "Created repository %s from %s" msgstr "新版本库%s基于%s建立。" -#: rhodecode/controllers/admin/repos.py:166 -#, python-format -msgid "created repository %s" +#: rhodecode/controllers/admin/repos.py:174 +#, fuzzy, python-format +msgid "Created repository %s" msgstr "建立版本库%s" #: rhodecode/controllers/admin/repos.py:197 +#, fuzzy, python-format +msgid "Error creating repository %s" +msgstr "建立版本库%s" + +#: rhodecode/controllers/admin/repos.py:266 #, python-format -msgid "error occurred during creation of repository %s" -msgstr "创建版本库时发生错误%s" - -#: rhodecode/controllers/admin/repos.py:302 +msgid "Repository %s updated successfully" +msgstr "版本库%s成功更新" + +#: rhodecode/controllers/admin/repos.py:284 +#, fuzzy, python-format +msgid "Error occurred during update of repository %s" +msgstr "在更新版本库%s的时候发生错误" + +#: rhodecode/controllers/admin/repos.py:311 +#: rhodecode/controllers/api/api.py:877 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/api/api.py:879 +#, fuzzy, python-format +msgid "Deleted %s forks" +msgstr "已经删除版本库%s" + +#: rhodecode/controllers/admin/repos.py:319 +#, fuzzy, python-format +msgid "Deleted repository %s" +msgstr "已经删除版本库%s" + +#: rhodecode/controllers/admin/repos.py:322 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:327 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "在删除%s的时候发生错误" + +#: rhodecode/controllers/admin/repos.py:365 +#, fuzzy +msgid "Repository permissions updated" +msgstr "禁用创建版本库" + +#: rhodecode/controllers/admin/repos.py:384 msgid "An error occurred during deletion of repository user" msgstr "删除版本库用户时发生错误" -#: rhodecode/controllers/admin/repos.py:350 -msgid "An error occurred during deletion of repository users groups" +#: rhodecode/controllers/admin/repos.py:403 +#, fuzzy +msgid "An error occurred during deletion of repository user groups" msgstr "删除版本库用户组时发生错误" -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:421 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:438 msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: rhodecode/controllers/admin/repos.py:425 +#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:485 +msgid "An error occurred during unlocking" +msgstr "解锁时发生错误" + +#: rhodecode/controllers/admin/repos.py:476 +#, fuzzy +msgid "Unlocked" +msgstr "未锁" + +#: rhodecode/controllers/admin/repos.py:479 +#, fuzzy +msgid "Locked" +msgstr "已锁" + +#: rhodecode/controllers/admin/repos.py:481 +#, python-format +msgid "Repository has been %s" +msgstr "版本库已被%s" + +#: rhodecode/controllers/admin/repos.py:505 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:509 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301 +#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "令牌不匹配" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:527 msgid "Pulled from remote location" msgstr "成功拉取自远程路径" -#: rhodecode/controllers/admin/repos.py:449 +#: rhodecode/controllers/admin/repos.py:529 msgid "An error occurred during pull from remote location" msgstr "从远程路径拉取时发生错误" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:545 msgid "Nothing" msgstr "无" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:547 #, python-format msgid "Marked repo %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" -#: rhodecode/controllers/admin/repos.py:471 +#: rhodecode/controllers/admin/repos.py:551 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: rhodecode/controllers/admin/repos_groups.py:136 -#, python-format -msgid "created repos group %s" +#: rhodecode/controllers/admin/repos.py:590 +#, fuzzy +msgid "An error occurred during creation of field" +msgstr "创建用户%s时发生错误" + +#: rhodecode/controllers/admin/repos.py:604 +#, fuzzy +msgid "An error occurred during removal of field" +msgstr "保存电子邮件时发生错误" + +#: rhodecode/controllers/admin/repos_groups.py:145 +#, fuzzy, python-format +msgid "Created repository group %s" msgstr "建立版本库组%s" -#: rhodecode/controllers/admin/repos_groups.py:148 -#, python-format -msgid "error occurred during creation of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:157 +#, fuzzy, python-format +msgid "Error occurred during creation of repository group %s" msgstr "创建版本库组时发生错误%s" -#: rhodecode/controllers/admin/repos_groups.py:205 -#, python-format -msgid "updated repos group %s" -msgstr "更新版本库组%s" +#: rhodecode/controllers/admin/repos_groups.py:214 +#: rhodecode/controllers/admin/repos_groups.py:286 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:220 -#, python-format -msgid "error occurred during update of repos group %s" +#, fuzzy, python-format +msgid "Updated repository group %s" +msgstr "更新版本库组%s" + +#: rhodecode/controllers/admin/repos_groups.py:235 +#, fuzzy, python-format +msgid "Error occurred during update of repository group %s" msgstr "更新版本库组时发生错误%s" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:253 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "这个组内有%s个版本库因而无法删除" -#: rhodecode/controllers/admin/repos_groups.py:246 -#, python-format -msgid "removed repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:260 +#, fuzzy, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "这个组内有%s个版本库因而无法删除" + +#: rhodecode/controllers/admin/repos_groups.py:266 +#, fuzzy, python-format +msgid "Removed repository group %s" msgstr "移除版本库组%s" -#: rhodecode/controllers/admin/repos_groups.py:252 -msgid "Cannot delete this group it still contains subgroups" -msgstr "不能删除包含子组的组" - -#: rhodecode/controllers/admin/repos_groups.py:257 -#: rhodecode/controllers/admin/repos_groups.py:262 -#, python-format -msgid "error occurred during deletion of repos group %s" +#: rhodecode/controllers/admin/repos_groups.py:271 +#, fuzzy, python-format +msgid "Error occurred during deletion of repos group %s" msgstr "删除版本库组时发生错误%s" -#: rhodecode/controllers/admin/repos_groups.py:283 +#: rhodecode/controllers/admin/repos_groups.py:297 msgid "An error occurred during deletion of group user" msgstr "删除组用户时发生错误" -#: rhodecode/controllers/admin/repos_groups.py:304 -msgid "An error occurred during deletion of group users groups" +#: rhodecode/controllers/admin/repos_groups.py:318 +#, fuzzy +msgid "An error occurred during deletion of group user groups" msgstr "删除版本库组的用户组时发生错误" -#: rhodecode/controllers/admin/settings.py:124 +#: rhodecode/controllers/admin/settings.py:126 #, fuzzy, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "重新扫描版本库成功，增加%s， 移除%s" -#: rhodecode/controllers/admin/settings.py:133 +#: rhodecode/controllers/admin/settings.py:135 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" -#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:166 msgid "Updated application settings" msgstr "更新应用设置" -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:170 #: rhodecode/controllers/admin/settings.py:301 -msgid "error occurred during updating application settings" +#, fuzzy +msgid "Error occurred during updating application settings" msgstr "更新设置时发生错误" -#: rhodecode/controllers/admin/settings.py:209 +#: rhodecode/controllers/admin/settings.py:216 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: rhodecode/controllers/admin/settings.py:214 -msgid "error occurred during updating visualisation settings" +#: rhodecode/controllers/admin/settings.py:221 +#, fuzzy +msgid "Error occurred during updating visualisation settings" msgstr "更新可视化设置时发生错误" #: rhodecode/controllers/admin/settings.py:297 @@ -608,35 +680,36 @@ msgstr "更新钩子" #: rhodecode/controllers/admin/settings.py:327 -msgid "error occurred during hook creation" +#, fuzzy +msgid "Error occurred during hook creation" msgstr "创建钩子时发生错误" #: rhodecode/controllers/admin/settings.py:346 msgid "Email task created" msgstr "已创建电子邮件任务" -#: rhodecode/controllers/admin/settings.py:408 +#: rhodecode/controllers/admin/settings.py:410 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/controllers/admin/settings.py:448 +#: rhodecode/controllers/admin/settings.py:452 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: rhodecode/controllers/admin/settings.py:463 +#: rhodecode/controllers/admin/settings.py:467 #: rhodecode/controllers/admin/users.py:198 -#, python-format -msgid "error occurred during update of user %s" +#, fuzzy, python-format +msgid "Error occurred during update of user %s" msgstr "更新用户%s时发生错误" #: rhodecode/controllers/admin/users.py:130 -#, python-format -msgid "created user %s" +#, fuzzy, python-format +msgid "Created user %s" msgstr "创建用户%s" #: rhodecode/controllers/admin/users.py:142 -#, python-format -msgid "error occurred during creation of user %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user %s" msgstr "创建用户%s时发生错误" #: rhodecode/controllers/admin/users.py:176 @@ -644,7 +717,8 @@ msgstr "用户更新成功" #: rhodecode/controllers/admin/users.py:214 -msgid "successfully deleted user" +#, fuzzy +msgid "Successfully deleted user" msgstr "用户删除成功" #: rhodecode/controllers/admin/users.py:219 @@ -672,7 +746,7 @@ msgstr "成功撤销用户“复刻版本库”权限" #: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:279 +#: rhodecode/controllers/admin/users_groups.py:281 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" @@ -705,221 +779,229 @@ msgstr "成功删除用户电子邮件" #: rhodecode/controllers/admin/users_groups.py:86 -#, python-format -msgid "created users group %s" +#, fuzzy, python-format +msgid "Created user group %s" msgstr "建立用户组%s" #: rhodecode/controllers/admin/users_groups.py:97 -#, python-format -msgid "error occurred during creation of users group %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user group %s" msgstr "创建用户组%s时发生错误" -#: rhodecode/controllers/admin/users_groups.py:164 -#, python-format -msgid "updated users group %s" +#: rhodecode/controllers/admin/users_groups.py:166 +#, fuzzy, python-format +msgid "Updated user group %s" msgstr "更新用户组%s" -#: rhodecode/controllers/admin/users_groups.py:186 -#, python-format -msgid "error occurred during update of users group %s" +#: rhodecode/controllers/admin/users_groups.py:188 +#, fuzzy, python-format +msgid "Error occurred during update of user group %s" msgstr "更新用户组%s时发生错误" -#: rhodecode/controllers/admin/users_groups.py:203 -msgid "successfully deleted users group" +#: rhodecode/controllers/admin/users_groups.py:205 +#, fuzzy +msgid "Successfully deleted user group" msgstr "删除用户组成功" -#: rhodecode/controllers/admin/users_groups.py:208 -msgid "An error occurred during deletion of users group" +#: rhodecode/controllers/admin/users_groups.py:210 +#, fuzzy +msgid "An error occurred during deletion of user group" msgstr "删除用户组时发生错误" -#: rhodecode/controllers/admin/users_groups.py:257 -msgid "Granted 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:259 +#, fuzzy +msgid "Granted 'repository create' permission to user group" msgstr "已授予用户组“创建版本库”的权限" -#: rhodecode/controllers/admin/users_groups.py:262 -msgid "Revoked 'repository create' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:264 +#, fuzzy +msgid "Revoked 'repository create' permission to user group" msgstr "已撤销用户组“创建版本库”的权限" -#: rhodecode/controllers/admin/users_groups.py:268 -msgid "Granted 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:270 +#, fuzzy +msgid "Granted 'repository fork' permission to user group" msgstr "已授予用户组“复刻版本库”的权限" -#: rhodecode/controllers/admin/users_groups.py:273 -msgid "Revoked 'repository fork' permission to users group" +#: rhodecode/controllers/admin/users_groups.py:275 +#, fuzzy +msgid "Revoked 'repository fork' permission to user group" msgstr "已撤销用户组“复刻版本库”的权限" -#: rhodecode/lib/auth.py:509 +#: rhodecode/lib/auth.py:530 #, fuzzy, python-format msgid "IP %s not allowed" msgstr "%s个关注者" -#: rhodecode/lib/auth.py:558 +#: rhodecode/lib/auth.py:579 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: rhodecode/lib/auth.py:599 +#: rhodecode/lib/auth.py:620 msgid "You need to be a signed in to view this page" msgstr "必须登录才能访问该页面" -#: rhodecode/lib/diffs.py:74 -msgid "binary file" +#: rhodecode/lib/diffs.py:66 +#, fuzzy +msgid "Binary file" msgstr "二进制文件" -#: rhodecode/lib/diffs.py:90 +#: rhodecode/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "修订集因过大而被截断，可查看原始修订集作为替代" -#: rhodecode/lib/diffs.py:100 +#: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "未发现差异" -#: rhodecode/lib/helpers.py:374 +#: rhodecode/lib/helpers.py:394 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%Y/%m/%d %H:%M:%S" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:506 msgid "True" msgstr "是" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:509 msgid "False" msgstr "否" -#: rhodecode/lib/helpers.py:530 +#: rhodecode/lib/helpers.py:547 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支%s" -#: rhodecode/lib/helpers.py:533 +#: rhodecode/lib/helpers.py:550 #, python-format msgid "Created tag: %s" msgstr "创建标签%s" -#: rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:563 msgid "Changeset not found" msgstr "未找到修订集" -#: rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "Show all combined changesets %s->%s" msgstr "显示合并的修订集%s->%s" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:621 msgid "compare view" msgstr "比较显示" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:641 msgid "and" msgstr "还有" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:642 #, python-format msgid "%s more" msgstr "%s个" -#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 msgid "revisions" msgstr "修订" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:667 #, python-format msgid "fork name %s" msgstr "复刻名称%s" -#: rhodecode/lib/helpers.py:658 -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/lib/helpers.py:684 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "拉取请求#%s" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:690 msgid "[deleted] repository" msgstr "[删除]版本库" -#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 +#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 msgid "[created] repository" msgstr "[创建]版本库" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:694 msgid "[created] repository as fork" msgstr "[创建]复刻版本库" -#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 +#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 msgid "[forked] repository" msgstr "[复刻]版本库" -#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 +#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 msgid "[updated] repository" msgstr "[更新]版本库" -#: rhodecode/lib/helpers.py:674 +#: rhodecode/lib/helpers.py:700 msgid "[delete] repository" msgstr "[删除]版本库" -#: rhodecode/lib/helpers.py:682 +#: rhodecode/lib/helpers.py:708 msgid "[created] user" msgstr "[创建]用户" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:710 msgid "[updated] user" msgstr "[更新]用户" -#: rhodecode/lib/helpers.py:686 -msgid "[created] users group" +#: rhodecode/lib/helpers.py:712 +#, fuzzy +msgid "[created] user group" msgstr "[创建]用户组" -#: rhodecode/lib/helpers.py:688 -msgid "[updated] users group" +#: rhodecode/lib/helpers.py:714 +#, fuzzy +msgid "[updated] user group" msgstr "[更新]用户组" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:716 msgid "[commented] on revision in repository" msgstr "[评论]了版本库中的修订" -#: rhodecode/lib/helpers.py:692 +#: rhodecode/lib/helpers.py:718 msgid "[commented] on pull request for" msgstr "[评论]拉取请求" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:720 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: rhodecode/lib/helpers.py:696 +#: rhodecode/lib/helpers.py:722 msgid "[pushed] into" msgstr "[推送]到" -#: rhodecode/lib/helpers.py:698 +#: rhodecode/lib/helpers.py:724 msgid "[committed via RhodeCode] into repository" msgstr "[通过RhodeCode提交]到版本库" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:726 msgid "[pulled from remote] into repository" msgstr "[远程拉取]到版本库" -#: rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:728 msgid "[pulled] from" msgstr "[拉取]自" -#: rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:730 msgid "[started following] repository" msgstr "[开始关注]版本库" -#: rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:732 msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: rhodecode/lib/helpers.py:884 +#: rhodecode/lib/helpers.py:910 #, python-format msgid " and %s more" msgstr "还有%s个" -#: rhodecode/lib/helpers.py:888 +#: rhodecode/lib/helpers.py:914 msgid "No Files" msgstr "没有文件" -#: rhodecode/lib/helpers.py:1164 +#: rhodecode/lib/helpers.py:1198 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -927,179 +1009,224 @@ "repositories" msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" -#: rhodecode/lib/utils2.py:403 +#: rhodecode/lib/unionrepo.py:193 +#, fuzzy +msgid "cannot create new union repository" +msgstr "[创建]版本库" + +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: rhodecode/lib/utils2.py:404 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" -#: rhodecode/lib/utils2.py:405 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" -#: rhodecode/lib/utils2.py:406 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d时" -#: rhodecode/lib/utils2.py:407 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: rhodecode/lib/utils2.py:408 +#: rhodecode/lib/utils2.py:416 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: rhodecode/lib/utils2.py:424 +#: rhodecode/lib/utils2.py:432 #, python-format msgid "in %s" msgstr "%s" -#: rhodecode/lib/utils2.py:426 +#: rhodecode/lib/utils2.py:434 #, python-format msgid "%s ago" msgstr "%s前" -#: rhodecode/lib/utils2.py:428 +#: rhodecode/lib/utils2.py:436 #, python-format msgid "in %s and %s" msgstr "%s零%s" -#: rhodecode/lib/utils2.py:431 +#: rhodecode/lib/utils2.py:439 #, python-format msgid "%s and %s ago" msgstr "%s零%s前" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:442 msgid "just now" msgstr "刚才" -#: rhodecode/lib/celerylib/tasks.py:270 -msgid "password reset link" -msgstr "密码重置链接" - #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 msgid "Repository no access" msgstr "无版本库访问权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 msgid "Repository read access" msgstr "版本库读取权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 msgid "Repository write access" msgstr "版本库写入权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 msgid "Repository admin access" msgstr "版本库管理权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 msgid "Repositories Group no access" msgstr "无版本库组访问权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 msgid "Repositories Group read access" msgstr "版本库组读取权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 msgid "Repositories Group write access" msgstr "版本库组写入" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 msgid "Repositories Group admin access" msgstr "版本库组管理权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 msgid "RhodeCode Administrator" msgstr "RhodeCode 管理员" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 msgid "Repository creation disabled" msgstr "禁用创建版本库" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 msgid "Repository creation enabled" msgstr "允许创建版本库" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 msgid "Repository forking disabled" msgstr "禁用复刻版本库" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 msgid "Repository forking enabled" msgstr "允许复刻版本库" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 msgid "Register disabled" msgstr "禁用注册" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "用手动激活注册新用户" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "用自动激活注册新用户" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 msgid "Not Reviewed" msgstr "未检视" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 msgid "Approved" msgstr "已批准" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 msgid "Rejected" msgstr "驳回" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 msgid "Under Review" msgstr "检视中" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "在%s行" -#: rhodecode/model/comment.py:176 +#: rhodecode/model/comment.py:219 msgid "[Mention]" msgstr "[提及]" +#: rhodecode/model/db.py:1252 +msgid "top level" +msgstr "" + +#: rhodecode/model/db.py:1393 +#, fuzzy +msgid "Repository group no access" +msgstr "无版本库组访问权限" + +#: rhodecode/model/db.py:1394 +#, fuzzy +msgid "Repository group read access" +msgstr "版本库组读取权限" + +#: rhodecode/model/db.py:1395 +#, fuzzy +msgid "Repository group write access" +msgstr "版本库组写入" + +#: rhodecode/model/db.py:1396 +#, fuzzy +msgid "Repository group admin access" +msgstr "版本库组管理权限" + #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "请登录" @@ -1118,217 +1245,245 @@ msgid "Enter %(min)i characters or more" msgstr "输入少于%(min)i个字符" -#: rhodecode/model/notification.py:220 -#, python-format -msgid "commented on commit at %(when)s" +#: rhodecode/model/notification.py:224 +#, fuzzy, python-format +msgid "%(user)s commented on changeset at %(when)s" msgstr "在%(when)s评论了提交" -#: rhodecode/model/notification.py:221 -#, python-format -msgid "sent message at %(when)s" -msgstr "在%(when)s发送信息" - -#: rhodecode/model/notification.py:222 -#, python-format -msgid "mentioned you at %(when)s" -msgstr "在%(when)s提到了你" - -#: rhodecode/model/notification.py:223 -#, python-format -msgid "registered in RhodeCode at %(when)s" -msgstr "在%(when)s注册到RhodeCode" - -#: rhodecode/model/notification.py:224 -#, python-format -msgid "opened new pull request at %(when)s" -msgstr "在%(when)s创建新的拉取请求" - #: rhodecode/model/notification.py:225 -#, python-format -msgid "commented on pull request at %(when)s" +#, fuzzy, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "在%(when)s发送信息" + +#: rhodecode/model/notification.py:226 +#, fuzzy, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "在%(when)s提到了你" + +#: rhodecode/model/notification.py:227 +#, fuzzy, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "在%(when)s注册到RhodeCode" + +#: rhodecode/model/notification.py:228 +#, fuzzy, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "在%(when)s创建新的拉取请求" + +#: rhodecode/model/notification.py:229 +#, fuzzy, python-format +msgid "%(user)s commented on pull request at %(when)s" msgstr "在%(when)s评论了拉取请求" -#: rhodecode/model/pull_request.py:100 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_id)s" +#: rhodecode/model/pull_request.py:104 +#, fuzzy, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "%(user)s想要你检视拉取请求#%(pr_id)s" -#: rhodecode/model/scm.py:556 +#: rhodecode/model/scm.py:598 msgid "latest tip" msgstr "最新tip版本" -#: rhodecode/model/user.py:231 -msgid "new user registration" +#: rhodecode/model/user.py:232 +#, fuzzy +msgid "New user registration" msgstr "[RhodeCode]新用户注册" -#: rhodecode/model/user.py:256 rhodecode/model/user.py:280 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/model/user.py:302 +#: rhodecode/model/user.py:303 msgid "You can't remove this user since it's crucial for entire application" msgstr "由于是系统帐号，无法删除该用户" -#: rhodecode/model/user.py:308 +#: rhodecode/model/user.py:309 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" -#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38 +#: rhodecode/model/user.py:334 +#, fuzzy +msgid "Password reset link" +msgstr "密码重置链接" + +#: rhodecode/model/user.py:366 +#, fuzzy +msgid "Your new password" +msgstr "新密码" + +#: rhodecode/model/user.py:367 +#, python-format +msgid "Your new RhodeCode password:%s" +msgstr "" + +#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" msgstr "值不能为空" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "用户名称%(username)s已经存在" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "不允许用户名 \"%(username)s\"" -#: rhodecode/model/validators.py:88 +#: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头" -#: rhodecode/model/validators.py:116 +#: rhodecode/model/validators.py:117 #, python-format msgid "Username %(username)s is not valid" msgstr "用户名称 %(username)s 无效" -#: rhodecode/model/validators.py:135 -msgid "Invalid users group name" +#: rhodecode/model/validators.py:136 +#, fuzzy +msgid "Invalid user group name" msgstr "无效的用户组名" -#: rhodecode/model/validators.py:136 -#, python-format -msgid "Users group \"%(usersgroup)s\" already exists" +#: rhodecode/model/validators.py:137 +#, fuzzy, python-format +msgid "User group \"%(usergroup)s\" already exists" msgstr "用户组 \"%(usersgroup)s\" 已经存在" -#: rhodecode/model/validators.py:138 +#: rhodecode/model/validators.py:139 +#, fuzzy msgid "" -"users group name may only contain alphanumeric characters underscores, " +"user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头" -#: rhodecode/model/validators.py:176 +#: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" msgstr "不能将这个组作为parent" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "组 \"%(group_name)s\" 已经存在" -#: rhodecode/model/validators.py:179 +#: rhodecode/model/validators.py:180 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "已经存在名为 \"%(group_name)s\" 的版本库" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:238 msgid "Invalid characters (non-ascii) in password" msgstr "密码含有无效（非ASCII）字符" -#: rhodecode/model/validators.py:252 +#: rhodecode/model/validators.py:253 msgid "Passwords do not match" msgstr "密码不符" -#: rhodecode/model/validators.py:269 +#: rhodecode/model/validators.py:270 msgid "invalid password" msgstr "无效密码" -#: rhodecode/model/validators.py:270 +#: rhodecode/model/validators.py:271 msgid "invalid user name" msgstr "无效用户名" -#: rhodecode/model/validators.py:271 +#: rhodecode/model/validators.py:272 msgid "Your account is disabled" msgstr "该帐号已被禁用" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "版本库名称不能为%(repo)s" -#: rhodecode/model/validators.py:317 +#: rhodecode/model/validators.py:318 #, python-format msgid "Repository named %(repo)s already exists" msgstr "已经存在版本库%(repo)s" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "版本库组 \"%(group)s\" 中已经存在版本库 \"%(repo)s\"" -#: rhodecode/model/validators.py:320 -#, python-format -msgid "Repositories group with name \"%(repo)s\" already exists" +#: rhodecode/model/validators.py:321 +#, fuzzy, python-format +msgid "Repository group with name \"%(repo)s\" already exists" msgstr "已经存在名为 \"%(repo)s\" 的版本库组" -#: rhodecode/model/validators.py:433 +#: rhodecode/model/validators.py:438 msgid "invalid clone url" msgstr "无效的克隆地址" -#: rhodecode/model/validators.py:434 +#: rhodecode/model/validators.py:439 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "无效的克隆地址，提供一个有效的克隆 http(s)或svn+http(s)地址" -#: rhodecode/model/validators.py:459 +#: rhodecode/model/validators.py:464 msgid "Fork have to be the same type as parent" msgstr "复刻版本库必须和父版本库类型相同" -#: rhodecode/model/validators.py:474 +#: rhodecode/model/validators.py:479 msgid "You don't have permissions to create repository in this group" msgstr "没有在该版本库组中创建版本库的权限" -#: rhodecode/model/validators.py:501 +#: rhodecode/model/validators.py:481 +#, fuzzy +msgid "no permission to create repository in root location" +msgstr "没有在该版本库组中创建版本库的权限" + +#: rhodecode/model/validators.py:518 #, fuzzy msgid "You don't have permissions to create a group in this location" msgstr "没有在该版本库组中创建版本库的权限" -#: rhodecode/model/validators.py:540 -msgid "This username or users group name is not valid" +#: rhodecode/model/validators.py:557 +#, fuzzy +msgid "This username or user group name is not valid" msgstr "用户或用户组名称无效" -#: rhodecode/model/validators.py:636 +#: rhodecode/model/validators.py:650 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: rhodecode/model/validators.py:651 +#: rhodecode/model/validators.py:665 msgid "This e-mail address is already taken" msgstr "该邮件地址已被使用" -#: rhodecode/model/validators.py:671 +#: rhodecode/model/validators.py:685 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "邮件地址\"%(email)s\"不存在" -#: rhodecode/model/validators.py:708 +#: rhodecode/model/validators.py:722 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名" -#: rhodecode/model/validators.py:727 +#: rhodecode/model/validators.py:735 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态" -#: rhodecode/model/validators.py:759 +#: rhodecode/model/validators.py:767 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:760 +#: rhodecode/model/validators.py:768 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/templates/index.html:3 +#: rhodecode/model/validators.py:800 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "控制面板" @@ -1337,223 +1492,229 @@ #: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/bookmarks/bookmarks.html:9 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:9 -#: rhodecode/templates/journal/journal.html:49 -#: rhodecode/templates/journal/journal.html:50 -#: rhodecode/templates/tags/tags.html:10 +#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:47 +#: rhodecode/templates/tags/tags.html:9 msgid "quick filter..." msgstr "快速过滤..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:239 msgid "repositories" msgstr "版本库" -#: rhodecode/templates/index_base.html:14 -#: rhodecode/templates/index_base.html:17 +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 #: rhodecode/templates/admin/repos/repos.html:21 msgid "Add repository" msgstr "添加版本库" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/index_base.html:20 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 +#, fuzzy +msgid "Add group" +msgstr "编辑版本库组" + +#: rhodecode/templates/index_base.html:27 #, fuzzy msgid "Edit group" msgstr "编辑版本库组" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:36 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "Group name" msgstr "组名" -#: rhodecode/templates/index_base.html:37 -#: rhodecode/templates/index_base.html:79 +#: rhodecode/templates/index_base.html:41 +#: rhodecode/templates/index_base.html:83 #: rhodecode/templates/index_base.html:142 #: rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:270 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:73 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/forks/fork.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "描述" -#: rhodecode/templates/index_base.html:47 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 -msgid "Repositories group" +#: rhodecode/templates/index_base.html:51 +#: rhodecode/templates/admin/permissions/permissions.html:55 +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 +#: rhodecode/templates/forks/fork.html:47 +msgid "Repository group" msgstr "版本库组" -#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:82 #: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:271 -#: rhodecode/templates/admin/permissions/permissions.html:117 +#: rhodecode/templates/index_base.html:268 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:71 -#: rhodecode/templates/admin/users/user_edit.html:200 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:211 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 -#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/admin/users/user_edit_my_account.html:172 +#: rhodecode/templates/base/perms_summary.html:14 +#: rhodecode/templates/bookmarks/bookmarks.html:34 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:201 -#: rhodecode/templates/journal/journal.html:305 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:132 -#: rhodecode/templates/tags/tags.html:51 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/summary/summary.html:55 +#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/tags/tags.html:48 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名称" -#: rhodecode/templates/index_base.html:80 +#: rhodecode/templates/index_base.html:84 msgid "Last change" msgstr "最后修改" -#: rhodecode/templates/index_base.html:81 +#: rhodecode/templates/index_base.html:85 #: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:276 +#: rhodecode/templates/index_base.html:273 #: rhodecode/templates/admin/repos/repos.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:213 -#: rhodecode/templates/journal/journal.html:203 -#: rhodecode/templates/journal/journal.html:307 +#: rhodecode/templates/admin/users/user_edit_my_account.html:174 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:298 msgid "Tip" msgstr "Tip" -#: rhodecode/templates/index_base.html:82 +#: rhodecode/templates/index_base.html:86 #: rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:278 +#: rhodecode/templates/index_base.html:275 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "RSS" - -#: rhodecode/templates/index_base.html:84 +#: rhodecode/templates/index_base.html:87 msgid "Atom" msgstr "Atom" #: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:296 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:235 +#: rhodecode/templates/admin/users/user_edit_my_account.html:196 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:225 -#: rhodecode/templates/journal/journal.html:329 -#: rhodecode/templates/tags/tags.html:77 +#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/branches/branches.html:73 +#: rhodecode/templates/journal/journal.html:217 +#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "点击以升序排列" #: rhodecode/templates/index_base.html:172 -#: rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:301 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:297 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:236 +#: rhodecode/templates/admin/users/user_edit_my_account.html:197 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:226 -#: rhodecode/templates/journal/journal.html:330 -#: rhodecode/templates/tags/tags.html:78 +#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/branches/branches.html:74 +#: rhodecode/templates/journal/journal.html:218 +#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "点击以降序排列" #: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:274 +#: rhodecode/templates/index_base.html:271 msgid "Last Change" msgstr "最后修改" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:302 +#: rhodecode/templates/index_base.html:211 #: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:237 +#: rhodecode/templates/admin/users/user_edit_my_account.html:198 #: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:227 -#: rhodecode/templates/journal/journal.html:331 -#: rhodecode/templates/tags/tags.html:79 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:219 +#: rhodecode/templates/journal/journal.html:322 +#: rhodecode/templates/tags/tags.html:76 msgid "No records found." msgstr "没有找到记录" -#: rhodecode/templates/index_base.html:214 -#: rhodecode/templates/index_base.html:303 +#: rhodecode/templates/index_base.html:212 +#: rhodecode/templates/index_base.html:299 #: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:238 +#: rhodecode/templates/admin/users/user_edit_my_account.html:199 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:228 -#: rhodecode/templates/journal/journal.html:332 -#: rhodecode/templates/tags/tags.html:80 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:220 +#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "数据错误" -#: rhodecode/templates/index_base.html:215 -#: rhodecode/templates/index_base.html:304 +#: rhodecode/templates/index_base.html:213 +#: rhodecode/templates/index_base.html:300 #: rhodecode/templates/admin/repos/repos.html:101 -#: rhodecode/templates/admin/users/user_edit_my_account.html:105 -#: rhodecode/templates/admin/users/user_edit_my_account.html:239 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +#: rhodecode/templates/admin/users/user_edit_my_account.html:200 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:229 -#: rhodecode/templates/journal/journal.html:333 -#: rhodecode/templates/tags/tags.html:81 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:221 +#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "载入中..." -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 -msgid "Sign In" +#: rhodecode/templates/index_base.html:298 +#, fuzzy +msgid "No repositories found." +msgstr "版本库组" + +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +msgid "Log In" msgstr "登录" #: rhodecode/templates/login.html:21 -msgid "Sign In to" -msgstr "登录到" +#, python-format +msgid "Log In to %s" +msgstr "" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:54 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:89 -#: rhodecode/templates/summary/summary.html:131 +#: rhodecode/templates/admin/users/user_edit.html:57 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 +#: rhodecode/templates/admin/users/users.html:77 +#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "帐号" #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:98 +#: rhodecode/templates/base/base.html:212 msgid "Password" msgstr "密码" @@ -1561,17 +1722,22 @@ msgid "Remember me" msgstr "记住密码" +#: rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "登录" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "忘记了密码？" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 msgid "Don't have an account ?" msgstr "还没有帐号？" #: rhodecode/templates/password_reset.html:5 -msgid "Reset your password" -msgstr "重置密码" +#, fuzzy +msgid "Password Reset" +msgstr "密码重置链接" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1603,23 +1769,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57 +#: rhodecode/templates/admin/users/user_edit.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "First Name" msgstr "名" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:103 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66 +#: rhodecode/templates/admin/users/user_edit.html:106 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 msgid "Last Name" msgstr "姓" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75 -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/admin/users/user_edit.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/summary/summary.html:125 msgid "Email" msgstr "电子邮件" @@ -1631,44 +1797,31 @@ msgid "Your account must wait for activation by administrator" msgstr "管理员审核后，你注册的帐号将被启用" -#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:76 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/summary/summary.html:77 msgid "Private repository" msgstr "私有版本库" -#: rhodecode/templates/repo_switcher_list.html:16 +#: rhodecode/templates/repo_switcher_list.html:12 +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/summary/summary.html:79 msgid "Public repository" msgstr "公共版本库" -#: rhodecode/templates/switch_to_list.html:3 -#: rhodecode/templates/branches/branches.html:14 -msgid "branches" -msgstr "分支" - #: rhodecode/templates/switch_to_list.html:10 #: rhodecode/templates/branches/branches_data.html:57 msgid "There are no branches yet" msgstr "没有任何分支" -#: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:15 -msgid "tags" -msgstr "标签" - #: rhodecode/templates/switch_to_list.html:22 #: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "没有任何标签" -#: rhodecode/templates/switch_to_list.html:28 -#: rhodecode/templates/bookmarks/bookmarks.html:15 -msgid "bookmarks" -msgstr "书签" - #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 msgid "There are no bookmarks yet" @@ -1676,6 +1829,7 @@ #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/base/base.html:68 msgid "Admin journal" msgstr "系统日志" @@ -1697,9 +1851,12 @@ #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account.html:215 -#: rhodecode/templates/journal/journal.html:205 -#: rhodecode/templates/journal/journal.html:309 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:87 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:300 msgid "Action" msgstr "操作" @@ -1709,11 +1866,11 @@ msgstr "版本库" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/tags/tags.html:52 +#: rhodecode/templates/tags/tags.html:49 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "日期" @@ -1732,6 +1889,7 @@ msgstr "版本库默认设置" #: rhodecode/templates/admin/defaults/defaults.html:11 +#: rhodecode/templates/base/base.html:75 msgid "Defaults" msgstr "默认设置" @@ -1744,8 +1902,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 +#: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1773,7 +1930,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 msgid "Enable locking" msgstr "启用锁定" @@ -1785,14 +1942,17 @@ #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 #: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:148 +#: rhodecode/templates/admin/repos/repo_edit.html:173 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:137 -#: rhodecode/templates/admin/users/user_edit.html:182 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users/user_edit.html:140 +#: rhodecode/templates/admin/users/user_edit.html:185 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "保存" @@ -1801,7 +1961,10 @@ msgstr "LDAP管理员" #: rhodecode/templates/admin/ldap/ldap.html:11 -msgid "Ldap" +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:74 +#, fuzzy +msgid "LDAP" msgstr "LDAP" #: rhodecode/templates/admin/ldap/ldap.html:28 @@ -1882,8 +2045,7 @@ msgstr "评论" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 msgid "Pull requests" msgstr "拉取请求" @@ -1901,6 +2063,7 @@ msgstr "显示通知" #: rhodecode/templates/admin/notifications/show_notification.html:9 +#: rhodecode/templates/base/base.html:241 msgid "Notifications" msgstr "通知" @@ -1909,11 +2072,12 @@ msgstr "权限管理" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63 -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:165 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/users/user_edit.html:150 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:86 +#: rhodecode/templates/base/base.html:73 msgid "Permissions" msgstr "权限" @@ -1926,31 +2090,25 @@ msgstr "匿名访问" #: rhodecode/templates/admin/permissions/permissions.html:49 +#, fuzzy msgid "" -"All default permissions on each repository will be reset to choosen " +"All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "所有版本库的默认权限将被重置到选择的权限，所有版本库的自定义权限将被丢弃" #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -msgid "overwrite existing settings" +#, fuzzy +msgid "Overwrite existing settings" msgstr "覆盖已有设置" -#: rhodecode/templates/admin/permissions/permissions.html:55 -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" -msgstr "版本库组" - #: rhodecode/templates/admin/permissions/permissions.html:62 +#, fuzzy msgid "" -"All default permissions on each repository group will be reset to choosen" -" permission, note that all custom default permission on repositories " -"group will be lost" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" msgstr "所有版本库组的默认权限将被重置到选择的权限，所有版本库组的自定义权限将被丢弃" #: rhodecode/templates/admin/permissions/permissions.html:69 @@ -1966,22 +2124,23 @@ msgstr "版本库复刻" #: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:209 -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:179 -#: rhodecode/templates/admin/settings/settings.html:269 -#: rhodecode/templates/admin/users/user_edit.html:138 -#: rhodecode/templates/admin/users/user_edit.html:183 -#: rhodecode/templates/admin/users/user_edit.html:286 -#: rhodecode/templates/admin/users/user_edit.html:334 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84 +#: rhodecode/templates/admin/permissions/permissions.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:149 +#: rhodecode/templates/admin/repos/repo_edit.html:174 +#: rhodecode/templates/admin/repos/repo_edit.html:388 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:278 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users/user_edit.html:283 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:95 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:110 msgid "Reset" msgstr "重置" @@ -1990,106 +2149,73 @@ msgid "Default User Permissions" msgstr "默认权限" -#: rhodecode/templates/admin/permissions/permissions.html:111 -#: rhodecode/templates/admin/users/user_edit.html:194 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -msgid "Nothing here yet" -msgstr "无条目" - -#: rhodecode/templates/admin/permissions/permissions.html:118 -#: rhodecode/templates/admin/users/user_edit.html:201 -#: rhodecode/templates/admin/users/user_edit_my_account.html:61 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 -msgid "Permission" -msgstr "权限" - -#: rhodecode/templates/admin/permissions/permissions.html:119 -#: rhodecode/templates/admin/users/user_edit.html:202 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 -msgid "Edit Permission" -msgstr "编辑权限" - -#: rhodecode/templates/admin/permissions/permissions.html:149 -#: rhodecode/templates/admin/permissions/permissions.html:151 -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:232 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:116 -#: rhodecode/templates/data_table/_dt_elements.html:117 -msgid "edit" -msgstr "编辑" - -#: rhodecode/templates/admin/permissions/permissions.html:168 -#: rhodecode/templates/admin/users/user_edit.html:295 +#: rhodecode/templates/admin/permissions/permissions.html:113 +#: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy msgid "Allowed IP addresses" msgstr "邮件地址" -#: rhodecode/templates/admin/permissions/permissions.html:182 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 -#: rhodecode/templates/admin/users/user_edit.html:263 -#: rhodecode/templates/admin/users/user_edit.html:308 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/admin/permissions/permissions.html:127 +#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 +#: rhodecode/templates/admin/users/user_edit.html:212 +#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users_groups/users_groups.html:46 #: rhodecode/templates/data_table/_dt_elements.html:122 #: rhodecode/templates/data_table/_dt_elements.html:130 msgid "delete" msgstr "删除" -#: rhodecode/templates/admin/permissions/permissions.html:183 -#: rhodecode/templates/admin/users/user_edit.html:309 +#: rhodecode/templates/admin/permissions/permissions.html:128 +#: rhodecode/templates/admin/users/user_edit.html:258 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "确认删除邮箱：%s" -#: rhodecode/templates/admin/permissions/permissions.html:189 -#: rhodecode/templates/admin/users/user_edit.html:315 +#: rhodecode/templates/admin/permissions/permissions.html:134 +#: rhodecode/templates/admin/users/user_edit.html:264 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:200 -#: rhodecode/templates/admin/users/user_edit.html:326 +#: rhodecode/templates/admin/permissions/permissions.html:145 +#: rhodecode/templates/admin/users/user_edit.html:275 #, fuzzy msgid "New ip address" msgstr "增加邮箱" -#: rhodecode/templates/admin/permissions/permissions.html:208 -#: rhodecode/templates/admin/users/user_edit.html:285 -#: rhodecode/templates/admin/users/user_edit.html:333 +#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:387 +#: rhodecode/templates/admin/users/user_edit.html:234 +#: rhodecode/templates/admin/users/user_edit.html:282 msgid "Add" msgstr "增加" -#: rhodecode/templates/admin/repos/repo_add.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -#: rhodecode/templates/base/base.html:154 +#: rhodecode/templates/admin/repos/repo_add.html:12 +#: rhodecode/templates/admin/repos/repo_add.html:16 +#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 +#: rhodecode/templates/base/base.html:263 msgid "Repositories" msgstr "版本库" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +#: rhodecode/templates/admin/repos/repo_add.html:19 +#, fuzzy +msgid "Add new" msgstr "新建" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:104 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Clone from" msgstr "克隆自" #: rhodecode/templates/admin/repos/repo_add_base.html:24 #: rhodecode/templates/admin/repos/repo_edit.html:44 -#: rhodecode/templates/settings/repo_settings.html:43 msgid "Optional http[s] url from which repository should be cloned." msgstr "可选的，指定版本库应该从哪个http[s]地址克隆。" #: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/forks/fork.html:54 +#: rhodecode/templates/forks/fork.html:51 msgid "Optionaly select a group to put this repository into." msgstr "可选的，选择一个组将版本库放到其中" @@ -2099,44 +2225,39 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 -#: rhodecode/templates/forks/fork.html:41 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/forks/fork.html:38 msgid "Landing revision" msgstr "默认修订" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 -#: rhodecode/templates/forks/fork.html:45 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "文件浏览、下载、whoosh和README的默认修订版本" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 -#: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:70 +#: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "保持简短。用README文件来写更长的描述。" -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -msgid "add" -msgstr "新建" - -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 -msgid "add new repository" -msgstr "新建版本库" - -#: rhodecode/templates/admin/repos/repo_edit.html:5 +#: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" msgstr "编辑版本库" +#: rhodecode/templates/admin/repos/repo_edit.html:12 +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:11 +#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/summary/summary.html:212 +msgid "Settings" +msgstr "设置" + #: rhodecode/templates/admin/repos/repo_edit.html:40 -#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "克隆地址" #: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 msgid "Optional select a group to put this repository into." msgstr "可选的，选择一个组将版本库放到其中" @@ -2144,164 +2265,211 @@ msgid "Change owner of this repository." msgstr "修改这个版本库的所有者" -#: rhodecode/templates/admin/repos/repo_edit.html:152 -msgid "Administration" -msgstr "管理" - -#: rhodecode/templates/admin/repos/repo_edit.html:155 +#: rhodecode/templates/admin/repos/repo_edit.html:184 +#, fuzzy +msgid "Advanced settings" +msgstr "保存设置" + +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Statistics" msgstr "统计" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Reset current statistics" msgstr "重置统计" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Confirm to remove current statistics" msgstr "确认移除当前统计" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "获取到修订" -#: rhodecode/templates/admin/repos/repo_edit.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:195 msgid "Stats gathered" msgstr "已收集的统计" -#: rhodecode/templates/admin/repos/repo_edit.html:171 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Remote" msgstr "远程" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Pull changes from remote location" msgstr "从远程路径拉取修订集" -#: rhodecode/templates/admin/repos/repo_edit.html:175 +#: rhodecode/templates/admin/repos/repo_edit.html:207 msgid "Confirm to pull changes from remote side" msgstr "确认从远程拉取修订集" -#: rhodecode/templates/admin/repos/repo_edit.html:186 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "Cache" msgstr "缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Invalidate repository cache" msgstr "清除版本库缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "Confirm to invalidate repository cache" msgstr "确认清除版本库缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:193 +#: rhodecode/templates/admin/repos/repo_edit.html:225 msgid "" "Manually invalidate cache for this repository. On first access repository" " will be cached again" msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:198 +#: rhodecode/templates/admin/repos/repo_edit.html:230 msgid "List of cached values" msgstr "缓存值列表" -#: rhodecode/templates/admin/repos/repo_edit.html:201 +#: rhodecode/templates/admin/repos/repo_edit.html:233 msgid "Prefix" msgstr "前缀" -#: rhodecode/templates/admin/repos/repo_edit.html:202 +#: rhodecode/templates/admin/repos/repo_edit.html:234 msgid "Key" msgstr "键" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:235 #: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:121 +#: rhodecode/templates/admin/users/user_edit.html:124 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_group_add.html:41 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +#: rhodecode/templates/admin/users_groups/users_groups.html:36 msgid "Active" msgstr "启用" -#: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:306 -#: rhodecode/templates/base/base.html:308 -#: rhodecode/templates/base/base.html:310 +#: rhodecode/templates/admin/repos/repo_edit.html:250 +#: rhodecode/templates/base/base.html:280 +#: rhodecode/templates/base/base.html:281 msgid "Public journal" msgstr "公共日志" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "Remove from public journal" msgstr "从公共日志删除" -#: rhodecode/templates/admin/repos/repo_edit.html:226 +#: rhodecode/templates/admin/repos/repo_edit.html:258 msgid "Add to public journal" msgstr "添加到公共日志" -#: rhodecode/templates/admin/repos/repo_edit.html:231 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" -#: rhodecode/templates/admin/repos/repo_edit.html:238 +#: rhodecode/templates/admin/repos/repo_edit.html:270 msgid "Locking" msgstr "锁定" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Unlock locked repo" msgstr "解锁版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Confirm to unlock repository" msgstr "确认解锁版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "lock repo" msgstr "锁定版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to lock repository" msgstr "确认锁定版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:247 +#: rhodecode/templates/admin/repos/repo_edit.html:279 msgid "Repository is not locked" msgstr "版本库未锁定" -#: rhodecode/templates/admin/repos/repo_edit.html:252 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "强制锁定版本库。只有在禁止匿名访问时候才有效" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:291 msgid "Set as fork of" msgstr "设置复刻自" -#: rhodecode/templates/admin/repos/repo_edit.html:264 +#: rhodecode/templates/admin/repos/repo_edit.html:296 msgid "set" msgstr "设置" -#: rhodecode/templates/admin/repos/repo_edit.html:268 +#: rhodecode/templates/admin/repos/repo_edit.html:300 msgid "Manually set this repository as a fork of another from the list" msgstr "从列表中手动设置这个版本库复刻自另一版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:274 +#: rhodecode/templates/admin/repos/repo_edit.html:306 #: rhodecode/templates/changeset/changeset_file_comment.html:41 msgid "Delete" msgstr "删除" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Remove this repository" msgstr "删除版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Confirm to delete this repository" msgstr "确认删除版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:282 -#: rhodecode/templates/settings/repo_settings.html:119 +#: rhodecode/templates/admin/repos/repo_edit.html:317 +#, fuzzy, python-format +msgid "this repository has %s fork" +msgid_plural "this repository has %s forks" +msgstr[0] "[创建]复刻版本库" + +#: rhodecode/templates/admin/repos/repo_edit.html:318 +#, fuzzy +msgid "Detach forks" +msgstr "设置复刻自" + +#: rhodecode/templates/admin/repos/repo_edit.html:319 +#, fuzzy +msgid "Delete forks" +msgstr "删除" + +#: rhodecode/templates/admin/repos/repo_edit.html:322 +#, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need fully delete it " -"from file system please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" +" from file system please do it manually" msgstr "这个版本库将以特殊的方式重命名这样RhodeCode和版本控制系统将不能访问它。如果需要从文件系统完全删除，请要手动操作" +#: rhodecode/templates/admin/repos/repo_edit.html:336 +msgid "Extra fields" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:348 +#, fuzzy, python-format +msgid "Confirm to delete this field: %s" +msgstr "确认删除邮箱：%s" + +#: rhodecode/templates/admin/repos/repo_edit.html:362 +#, fuzzy +msgid "New field key" +msgstr "新建文件" + +#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgid "New field label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:373 +msgid "Enter short label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:379 +#, fuzzy +msgid "New field description" +msgstr "描述" + +#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgid "Enter description of a field" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -2319,8 +2487,6 @@ #: 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:85 -#: rhodecode/templates/base/base.html:235 msgid "admin" msgstr "管理" @@ -2330,75 +2496,60 @@ msgstr "成员" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 -#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "私有版本库" #: rhodecode/templates/admin/repos/repo_edit_perms.html:19 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 msgid "default" msgstr "默认" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 msgid "revoke" msgstr "移除" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 msgid "Add another member" msgstr "添加成员" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 msgid "Failed to remove user" msgstr "删除用户失败" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 -msgid "Failed to remove users group" +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 +#, fuzzy +msgid "Failed to remove user group" msgstr "删除用户组失败" #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "版本库管理员" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 msgid "apply to children" msgstr "应用到成员" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 #, fuzzy msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" msgstr "设置或者撤销该组所有成员的权限，包括版本库和其他组" +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#, fuzzy, python-format +msgid "%s Group Dashboard" +msgstr "使用轻量的控制面板" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 -#: rhodecode/templates/base/base.html:128 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 msgid "Home" msgstr "首页" @@ -2407,77 +2558,85 @@ msgstr "有" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repos group" -msgstr "添加版本库组" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 -msgid "Repos groups" +#, fuzzy +msgid "Add repository group" msgstr "版本库组" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 -msgid "add new repos group" +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 +#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 +#, fuzzy +msgid "Repository groups" +msgstr "版本库组" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 +#, fuzzy +msgid "Add new repository group" msgstr "添加新版本库组" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 msgid "Group parent" msgstr "上级组" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/users/user_add.html:94 -#: rhodecode/templates/admin/users_groups/users_group_add.html:49 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:149 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59 msgid "save" msgstr "保存" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repos group" +#, fuzzy +msgid "Edit repository group" msgstr "编辑版本库组" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 -msgid "edit repos group" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 +#, fuzzy, python-format +msgid "Edit repository group %s" msgstr "编辑版本库组" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 #, fuzzy -msgid "Add new child group" +msgid "Add child group" msgstr "添加新用户组" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repositories groups administration" +#, fuzzy +msgid "Repository groups administration" msgstr "版本库管理员" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -#, fuzzy -msgid "Add new group" -msgstr "添加新用户组" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" msgstr "顶层版本库数量" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "操作" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#, fuzzy +msgid "Edit" +msgstr "编辑" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/base/perms_summary.html:29 +#: rhodecode/templates/base/perms_summary.html:48 +#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/data_table/_dt_elements.html:116 +#: rhodecode/templates/data_table/_dt_elements.html:117 +msgid "edit" +msgstr "编辑" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "确认删除这个版本库组：%s包含%s个版本库" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68 -msgid "There are no repositories groups yet" +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 +#, fuzzy +msgid "There are no repository groups yet" msgstr "没有版本库组" #: rhodecode/templates/admin/settings/hooks.html:5 @@ -2485,12 +2644,6 @@ msgid "Settings administration" msgstr "系统设置" -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:13 -msgid "Settings" -msgstr "设置" - #: rhodecode/templates/admin/settings/hooks.html:24 msgid "Built in hooks - read only" msgstr "内建钩子 - 只读" @@ -2507,205 +2660,221 @@ msgid "Failed to remove hook" msgstr "移除钩子失败" -#: rhodecode/templates/admin/settings/settings.html:24 +#: rhodecode/templates/admin/settings/settings.html:26 msgid "Remap and rescan repositories" msgstr "重新扫描并映射版本库" -#: rhodecode/templates/admin/settings/settings.html:32 -msgid "rescan option" +#: rhodecode/templates/admin/settings/settings.html:34 +#, fuzzy +msgid "Rescan option" msgstr "重新扫描选项" -#: rhodecode/templates/admin/settings/settings.html:38 +#: rhodecode/templates/admin/settings/settings.html:40 msgid "" "In case a repository was deleted from filesystem and there are leftovers " "in the database check this option to scan obsolete data in database and " "remove it." msgstr "如果版本库已经从文件系统删除，但数据库仍然有遗留信息，请勾选该项进行清理" -#: rhodecode/templates/admin/settings/settings.html:39 -msgid "destroy old data" +#: rhodecode/templates/admin/settings/settings.html:41 +#, fuzzy +msgid "Destroy old data" msgstr "清理旧数据" -#: rhodecode/templates/admin/settings/settings.html:41 +#: rhodecode/templates/admin/settings/settings.html:43 msgid "" "Rescan repositories location for new repositories. Also deletes obsolete " "if `destroy` flag is checked " msgstr "重新扫描版本库路径以发现新版本库。 同时删除过时的，如果设置有 `destroy` 标志" -#: rhodecode/templates/admin/settings/settings.html:46 +#: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" msgstr "重新扫描版本库" -#: rhodecode/templates/admin/settings/settings.html:52 +#: rhodecode/templates/admin/settings/settings.html:54 msgid "Whoosh indexing" msgstr "Whoosh索引" -#: rhodecode/templates/admin/settings/settings.html:60 -msgid "index build option" +#: rhodecode/templates/admin/settings/settings.html:62 +#, fuzzy +msgid "Index build option" msgstr "构建索引选项" -#: rhodecode/templates/admin/settings/settings.html:65 -msgid "build from scratch" +#: rhodecode/templates/admin/settings/settings.html:67 +#, fuzzy +msgid "Build from scratch" msgstr "重新建立" -#: rhodecode/templates/admin/settings/settings.html:71 +#: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" msgstr "重新索引" -#: rhodecode/templates/admin/settings/settings.html:77 +#: rhodecode/templates/admin/settings/settings.html:79 msgid "Global application settings" msgstr "全局设置" -#: rhodecode/templates/admin/settings/settings.html:86 -msgid "Application name" -msgstr "应用名称" - -#: rhodecode/templates/admin/settings/settings.html:95 -msgid "Realm text" -msgstr "Realm text" - -#: rhodecode/templates/admin/settings/settings.html:104 -msgid "GA code" -msgstr "GA code" - -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/settings/settings.html:268 +#: rhodecode/templates/admin/settings/settings.html:88 +msgid "Site branding" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:97 +msgid "HTTP authentication realm" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:106 +msgid "Google Analytics code" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:114 +#: rhodecode/templates/admin/settings/settings.html:186 +#: rhodecode/templates/admin/settings/settings.html:277 msgid "Save settings" msgstr "保存设置" -#: rhodecode/templates/admin/settings/settings.html:119 +#: rhodecode/templates/admin/settings/settings.html:121 msgid "Visualisation settings" msgstr "可视化设置" -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:129 msgid "General" msgstr "通用" -#: rhodecode/templates/admin/settings/settings.html:132 +#: rhodecode/templates/admin/settings/settings.html:134 msgid "Use lightweight dashboard" msgstr "使用轻量的控制面板" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:140 +#, fuzzy +msgid "Use repository extra fields" +msgstr "版本库" + +#: rhodecode/templates/admin/settings/settings.html:147 msgid "Icons" msgstr "图标" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Show public repo icon on repositories" msgstr "显示公共版本库图标" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:156 msgid "Show private repo icon on repositories" msgstr "显示私有版本库图标" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:163 msgid "Meta-Tagging" msgstr "元标记" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:168 msgid "Stylify recognised metatags:" msgstr "样式化识别的元标记" -#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:195 msgid "VCS settings" msgstr "版本控制系统设置" -#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "Web" msgstr "网络" -#: rhodecode/templates/admin/settings/settings.html:201 -msgid "require ssl for vcs operations" +#: rhodecode/templates/admin/settings/settings.html:209 +#, fuzzy +msgid "Require SSL for vcs operations" msgstr "要求使用SSL进行版本控制系统操作" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" msgstr "勾选后RhodeCode将要求使用SSL进行推送和拉取。如果没有使用SSL将返回HTTP 406错误：Not Acceptable" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:217 msgid "Hooks" msgstr "钩子" -#: rhodecode/templates/admin/settings/settings.html:214 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Update repository after push (hg update)" msgstr "推送后更新版本库（hg update）" -#: rhodecode/templates/admin/settings/settings.html:218 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Show repository size after push" msgstr "推送后显示版本库大小" -#: rhodecode/templates/admin/settings/settings.html:222 -msgid "Log user push commands" -msgstr "记录用户推送命令" - -#: rhodecode/templates/admin/settings/settings.html:226 -msgid "Log user pull commands" -msgstr "记录用户拉取命令" - #: rhodecode/templates/admin/settings/settings.html:230 -msgid "advanced setup" +msgid "Log user push commands" +msgstr "记录用户推送命令" + +#: rhodecode/templates/admin/settings/settings.html:234 +msgid "Log user pull commands" +msgstr "记录用户拉取命令" + +#: rhodecode/templates/admin/settings/settings.html:238 +#, fuzzy +msgid "Advanced setup" msgstr "高级设置" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Mercurial Extensions" msgstr "Mercurial扩展" -#: rhodecode/templates/admin/settings/settings.html:240 -msgid "largefiles extensions" +#: rhodecode/templates/admin/settings/settings.html:248 +#, fuzzy +msgid "Enable largefiles extension" msgstr "大文件扩展" -#: rhodecode/templates/admin/settings/settings.html:244 -msgid "hgsubversion extensions" +#: rhodecode/templates/admin/settings/settings.html:252 +#, fuzzy +msgid "Enable hgsubversion extension" msgstr "hgsubversion扩展" -#: rhodecode/templates/admin/settings/settings.html:246 +#: rhodecode/templates/admin/settings/settings.html:254 +#, fuzzy msgid "" -"Requires hgsubversion library installed. Allows clonning from svn remote " +"Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr " 允许从远程svn地址克隆。需要安装hgsubversion库" -#: rhodecode/templates/admin/settings/settings.html:256 +#: rhodecode/templates/admin/settings/settings.html:264 msgid "Repositories location" msgstr "版本库路径" -#: rhodecode/templates/admin/settings/settings.html:261 +#: rhodecode/templates/admin/settings/settings.html:269 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "这是一个关键设置。如果确认修改该项设置，请重启服务以便设置生效。" -#: rhodecode/templates/admin/settings/settings.html:262 -#: rhodecode/templates/base/base.html:227 -msgid "unlock" +#: rhodecode/templates/admin/settings/settings.html:270 +#: rhodecode/templates/base/base.html:131 +#, fuzzy +msgid "Unlock" msgstr "解锁" -#: rhodecode/templates/admin/settings/settings.html:263 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "版本库存储路径。 修改后需要重启和重新扫描" -#: rhodecode/templates/admin/settings/settings.html:283 +#: rhodecode/templates/admin/settings/settings.html:292 msgid "Test Email" msgstr "测试邮件" -#: rhodecode/templates/admin/settings/settings.html:291 +#: rhodecode/templates/admin/settings/settings.html:300 msgid "Email to" msgstr "发送到" -#: rhodecode/templates/admin/settings/settings.html:299 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "Send" msgstr "发送" -#: rhodecode/templates/admin/settings/settings.html:305 +#: rhodecode/templates/admin/settings/settings.html:314 msgid "System Info and Packages" msgstr "系统和软件包信息" -#: rhodecode/templates/admin/settings/settings.html:308 -msgid "show" +#: rhodecode/templates/admin/settings/settings.html:317 +#: rhodecode/templates/changelog/changelog.html:42 +msgid "Show" msgstr "显示" #: rhodecode/templates/admin/users/user_add.html:5 @@ -2714,11 +2883,14 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 +#: rhodecode/templates/base/base.html:71 msgid "Users" msgstr "用户" #: rhodecode/templates/admin/users/user_add.html:12 -msgid "add new user" +#: rhodecode/templates/admin/users/users.html:23 +#, fuzzy +msgid "Add new user" msgstr "添加新用户" #: rhodecode/templates/admin/users/user_add.html:50 @@ -2729,6 +2901,12 @@ msgid "Edit user" msgstr "编辑用户" +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#, fuzzy, python-format +msgid "Edit %s" +msgstr "编辑" + #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 msgid "Change your avatar at" @@ -2744,30 +2922,31 @@ msgid "API key" msgstr "API密钥" -#: rhodecode/templates/admin/users/user_edit.html:48 -msgid "Your IP" +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 +msgid "Current IP" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:67 +#: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" msgstr "LDAP DN" -#: rhodecode/templates/admin/users/user_edit.html:76 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39 +#: rhodecode/templates/admin/users/user_edit.html:79 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password" msgstr "新密码" -#: rhodecode/templates/admin/users/user_edit.html:85 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48 +#: rhodecode/templates/admin/users/user_edit.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "New password confirmation" msgstr "确认新密码" -#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:158 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "继承默认权限" -#: rhodecode/templates/admin/users/user_edit.html:160 +#: rhodecode/templates/admin/users/user_edit.html:163 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2775,31 +2954,31 @@ "options does not have any action" msgstr "勾选以从%s继承权限设置。 勾选后下面的选项将不起作用" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:169 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "创建版本库" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:177 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "复刻版本库" -#: rhodecode/templates/admin/users/user_edit.html:251 +#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "邮件地址" -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/users/user_edit.html:213 #, python-format msgid "Confirm to delete this email: %s" msgstr "确认删除邮箱：%s" -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "New email address" msgstr "增加邮箱" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:130 +#: rhodecode/templates/base/base.html:242 msgid "My account" msgstr "我的账户" @@ -2812,7 +2991,7 @@ msgstr "我的权限" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:57 +#: rhodecode/templates/journal/journal.html:54 msgid "My repos" msgstr "我的版本库" @@ -2820,30 +2999,44 @@ msgid "My pull requests" msgstr "我的拉取请求" -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/journal/journal.html:61 -msgid "Add repo" -msgstr "新建版本库" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 +#, fuzzy +msgid "Show closed pull requests" +msgstr "[关闭] 拉取请求" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" msgstr "我创建的" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 #, python-format msgid "Pull request #%s opened on %s" msgstr "拉取请求#%s创建于%s" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 +#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_show.html:27 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +msgid "Closed" +msgstr "已关闭" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 msgid "Confirm to delete this pull request" msgstr "确认删除拉取请求" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 +msgid "Nothing here yet" +msgstr "无条目" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" msgstr "我参与的" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "拉取请求#%s由%s创建于%s" @@ -2853,68 +3046,60 @@ msgstr "用户管理员" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:241 msgid "users" msgstr "用户" -#: rhodecode/templates/admin/users/users.html:23 +#: rhodecode/templates/admin/users/users.html:80 #, fuzzy -msgid "Add new user" -msgstr "添加新用户" - -#: rhodecode/templates/admin/users/users.html:77 -msgid "username" -msgstr "用户名" - -#: rhodecode/templates/admin/users/users.html:80 -msgid "firstname" +msgid "Firstname" msgstr "名" #: rhodecode/templates/admin/users/users.html:81 -msgid "lastname" +#, fuzzy +msgid "Lastname" msgstr "姓" #: rhodecode/templates/admin/users/users.html:82 -msgid "last login" +#, fuzzy +msgid "Last login" msgstr "最后登录" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" -msgstr "启用" - -#: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:244 -msgid "ldap" -msgstr "LDAP" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -msgid "Add users group" +#, fuzzy +msgid "Add user group" msgstr "添加用户组" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -msgid "Users groups" +#: rhodecode/templates/admin/users_groups/users_groups.html:11 +#: rhodecode/templates/base/base.html:72 +#, fuzzy +msgid "User groups" msgstr "用户组" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -msgid "add new users group" +#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#, fuzzy +msgid "Add new user group" msgstr "添加新用户组" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit users group" +#, fuzzy +msgid "Edit user group" msgstr "编辑用户组" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -msgid "UsersGroups" +#, fuzzy +msgid "UserGroups" msgstr "用户组" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "Members" msgstr "成员" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -msgid "Choosen group members" +#, fuzzy +msgid "Chosen group members" msgstr "选择组成员" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 @@ -2929,264 +3114,264 @@ msgid "Add all elements" msgstr "添加全部项目" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 msgid "Group members" msgstr "拥护者成员" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 msgid "No members yet" msgstr "还没有成员" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 -msgid "Permissions defined for this group" -msgstr "这个组的权限" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 -msgid "No permissions set yet" -msgstr "还未设置权限" - #: rhodecode/templates/admin/users_groups/users_groups.html:5 -msgid "Users groups administration" +#, fuzzy +msgid "User groups administration" msgstr "用户组管理" -#: rhodecode/templates/admin/users_groups/users_groups.html:23 -#, fuzzy -msgid "Add new user group" -msgstr "添加新用户组" - -#: rhodecode/templates/admin/users_groups/users_groups.html:32 -msgid "group name" -msgstr "组名" - -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -#: rhodecode/templates/base/root.html:46 -msgid "members" -msgstr "成员" - -#: rhodecode/templates/admin/users_groups/users_groups.html:45 -#, python-format -msgid "Confirm to delete this users group: %s" +#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#, fuzzy, python-format +msgid "Confirm to delete this user group: %s" msgstr "确认删除该组：%s" -#: rhodecode/templates/base/base.html:41 +#: rhodecode/templates/base/base.html:42 msgid "Submit a bug" msgstr "提交bug" -#: rhodecode/templates/base/base.html:76 -#, fuzzy -msgid "Not logged in" -msgstr "最后登录" - -#: rhodecode/templates/base/base.html:83 -msgid "Login to your account" -msgstr "登录" - -#: rhodecode/templates/base/base.html:106 -msgid "Forgot password ?" -msgstr "忘记密码？" - -#: rhodecode/templates/base/base.html:113 -msgid "Log In" -msgstr "登录" - -#: rhodecode/templates/base/base.html:124 -msgid "Inbox" -msgstr "收件箱" - -#: rhodecode/templates/base/base.html:129 -#: rhodecode/templates/base/base.html:297 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:301 -#: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/public_journal.html:4 -msgid "Journal" -msgstr "日志" - -#: rhodecode/templates/base/base.html:131 -msgid "Log Out" -msgstr "退出" - -#: rhodecode/templates/base/base.html:150 -msgid "Switch repository" -msgstr "切换版本库" - -#: rhodecode/templates/base/base.html:152 -msgid "Products" -msgstr "产品" - -#: rhodecode/templates/base/base.html:158 -#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47 -msgid "loading..." -msgstr "载入中..." - -#: rhodecode/templates/base/base.html:166 -#: rhodecode/templates/base/base.html:168 -#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/base/base.html:108 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 +#: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "概况" -#: rhodecode/templates/base/base.html:174 -#: rhodecode/templates/base/base.html:176 -#: rhodecode/templates/base/base.html:178 -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/base/base.html:109 +#: rhodecode/templates/changelog/changelog.html:11 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "修订记录" -#: rhodecode/templates/base/base.html:182 -#: rhodecode/templates/base/base.html:184 -#: rhodecode/templates/base/base.html:186 -msgid "Switch to" -msgstr "切换到" - -#: rhodecode/templates/base/base.html:193 -#: rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:110 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:12 msgid "Files" msgstr "浏览" -#: rhodecode/templates/base/base.html:201 -#: rhodecode/templates/base/base.html:205 +#: rhodecode/templates/base/base.html:112 +#, fuzzy +msgid "Switch To" +msgstr "切换到" + +#: rhodecode/templates/base/base.html:114 +#: rhodecode/templates/base/base.html:267 +msgid "loading..." +msgstr "载入中..." + +#: rhodecode/templates/base/base.html:118 msgid "Options" msgstr "选项" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/base/base.html:212 -msgid "repository settings" -msgstr "版本库选项" - -#: rhodecode/templates/base/base.html:216 -#: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/forks/fork.html:13 -msgid "fork" -msgstr "复刻" - -#: rhodecode/templates/base/base.html:218 -#: rhodecode/templates/changelog/changelog.html:43 +#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "比较复刻" + +#: rhodecode/templates/base/base.html:126 #, fuzzy -msgid "open new pull request" -msgstr "新建拉取请求" - -#: rhodecode/templates/base/base.html:221 +msgid "Lightweight changelog" +msgstr "使用轻量的控制面板" + +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:54 +msgid "Search" +msgstr "搜索" + +#: rhodecode/templates/base/base.html:133 +#, fuzzy +msgid "Lock" +msgstr "锁定" + +#: rhodecode/templates/base/base.html:141 +#, fuzzy +msgid "Follow" +msgstr "关注者" + +#: rhodecode/templates/base/base.html:142 #, fuzzy -msgid "compare fork" -msgstr "比较复刻" - -#: rhodecode/templates/base/base.html:223 -msgid "search" -msgstr "搜索" - -#: rhodecode/templates/base/base.html:229 -msgid "lock" -msgstr "锁定" - -#: rhodecode/templates/base/base.html:240 -msgid "repositories groups" -msgstr "版本库组" - -#: rhodecode/templates/base/base.html:242 -msgid "users groups" -msgstr "用户组" +msgid "Unfollow" +msgstr "关注者" + +#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/forks/fork.html:9 +msgid "Fork" +msgstr "复刻" + +#: rhodecode/templates/base/base.html:147 +#, fuzzy +msgid "Create Pull Request" +msgstr "创建新的拉取请求" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Show Pull Requests" +msgstr "新建拉取请求" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Pull Requests" +msgstr "拉取请求" + +#: rhodecode/templates/base/base.html:190 +#, fuzzy +msgid "Not logged in" +msgstr "最后登录" + +#: rhodecode/templates/base/base.html:197 +msgid "Login to your account" +msgstr "登录" + +#: rhodecode/templates/base/base.html:220 +msgid "Forgot password ?" +msgstr "忘记密码？" #: rhodecode/templates/base/base.html:243 -msgid "permissions" +msgid "Log Out" +msgstr "退出" + +#: rhodecode/templates/base/base.html:262 +msgid "Switch repository" +msgstr "切换版本库" + +#: rhodecode/templates/base/base.html:274 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "日志" + +#: rhodecode/templates/base/base.html:286 +#, fuzzy +msgid "Search in repositories" +msgstr "在所有的版本库中搜索" + +#: rhodecode/templates/base/perms_summary.html:8 +#, fuzzy +msgid "No permissions defined yet" +msgstr "还未设置权限" + +#: rhodecode/templates/base/perms_summary.html:15 +msgid "Permission" msgstr "权限" -#: rhodecode/templates/base/base.html:245 -msgid "defaults" -msgstr "默认设置" - -#: rhodecode/templates/base/base.html:246 -msgid "settings" -msgstr "设置" - -#: rhodecode/templates/base/base.html:256 -#: rhodecode/templates/base/base.html:258 -msgid "Followers" -msgstr "关注者" - -#: rhodecode/templates/base/base.html:264 -#: rhodecode/templates/base/base.html:266 -msgid "Forks" -msgstr "复刻" - -#: rhodecode/templates/base/base.html:315 -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 -#: rhodecode/templates/search/search.html:52 -msgid "Search" -msgstr "搜索" - -#: rhodecode/templates/base/root.html:42 -msgid "add another comment" -msgstr "添加新的评论" +#: rhodecode/templates/base/perms_summary.html:16 +msgid "Edit Permission" +msgstr "编辑权限" #: rhodecode/templates/base/root.html:43 +#, fuzzy +msgid "Add another comment" +msgstr "添加新的评论" + +#: rhodecode/templates/base/root.html:44 #: rhodecode/templates/data_table/_dt_elements.html:140 -#: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "停止关注该版本库" -#: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:61 +#: rhodecode/templates/base/root.html:45 msgid "Start following this repository" msgstr "开始关注该版本库" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Group" msgstr "组" +#: rhodecode/templates/base/root.html:47 +msgid "members" +msgstr "成员" + #: rhodecode/templates/base/root.html:48 -msgid "search truncated" -msgstr "搜索被截断" +#: rhodecode/templates/pullrequests/pullrequest.html:181 +#, fuzzy +msgid "Loading ..." +msgstr "载入中..." #: rhodecode/templates/base/root.html:49 -msgid "no matching files" -msgstr "没有符合的文件" +#, fuzzy +msgid "Search truncated" +msgstr "搜索被截断" #: rhodecode/templates/base/root.html:50 -msgid "Open new pull request" -msgstr "新建拉取请求" +#, fuzzy +msgid "No matching files" +msgstr "没有符合的文件" #: rhodecode/templates/base/root.html:51 -msgid "Open new pull request for selected changesets" -msgstr "为选择的变更集创建新的拉取请求" +#: rhodecode/templates/changelog/changelog.html:36 +msgid "Open new pull request" +msgstr "新建拉取请求" #: rhodecode/templates/base/root.html:52 -msgid "Show selected changes __S -> __E" -msgstr "显示选定的修订集：__S -> __E" +msgid "Open new pull request for selected changesets" +msgstr "为选择的变更集创建新的拉取请求" #: rhodecode/templates/base/root.html:53 +#, fuzzy +msgid "Show selected changesets __S -> __E" +msgstr "显示选定的修订集：__S -> __E" + +#: rhodecode/templates/base/root.html:54 +#, fuzzy +msgid "Show selected changeset __S" +msgstr "显示选定的修订集：__S -> __E" + +#: rhodecode/templates/base/root.html:55 msgid "Selection link" msgstr "选择链接" +#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/changeset/diff_block.html:8 +#, fuzzy +msgid "Collapse diff" +msgstr "文件差异" + +#: rhodecode/templates/base/root.html:57 +#, fuzzy +msgid "Expand diff" +msgstr "原始diff" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "%s书签" -#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "作者" -#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks.html:38 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/tags/tags.html:55 +#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "修订" @@ -3196,15 +3381,13 @@ msgid "%s Branches" msgstr "%s分支" -#: rhodecode/templates/branches/branches.html:29 +#: rhodecode/templates/branches/branches.html:26 msgid "Compare branches" msgstr "比较分支" -#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches.html:53 #: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/compare/compare_diff.html:5 -#: rhodecode/templates/compare/compare_diff.html:13 -#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "比较显示" @@ -3214,115 +3397,82 @@ msgid "%s Changelog" msgstr "%s修订记录" -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/changelog/changelog.html:11 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "显示%d/%d个版本" -#: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/changelog/changelog.html:30 msgid "Clear selection" msgstr "清除选择" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 #: rhodecode/templates/forks/forks_data.html:19 -#, python-format -msgid "compare fork with %s" +#, fuzzy, python-format +msgid "Compare fork with %s" msgstr "比较复刻和%s" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 msgid "Compare fork with parent" msgstr "比较复刻和源版本库" -#: rhodecode/templates/changelog/changelog.html:49 -msgid "Show" -msgstr "显示" - -#: rhodecode/templates/changelog/changelog.html:74 -#: rhodecode/templates/summary/summary.html:375 -msgid "show more" +#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/summary/summary.html:404 +#, fuzzy +msgid "Show more" msgstr "显示更多" -#: rhodecode/templates/changelog/changelog.html:78 -msgid "Affected number of files, click to show more details" -msgstr "影响的文件数，点击显示详细信息" - -#: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:65 -#: rhodecode/templates/changeset/changeset_file_comment.html:20 -#: rhodecode/templates/changeset/changeset_range.html:46 -msgid "Changeset status" -msgstr "修订集状态" - -#: rhodecode/templates/changelog/changelog.html:94 -#: rhodecode/templates/shortlog/shortlog_data.html:20 -#, python-format -msgid "Click to open associated pull request #%s" -msgstr "点击建立相关的拉取请求 #%s" - -#: rhodecode/templates/changelog/changelog.html:104 -msgid "Parent" -msgstr "父版本" - -#: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:42 -msgid "No parents" -msgstr "无父版本" - -#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changeset/changeset_range.html:86 +#, fuzzy, python-format +msgid "Bookmark %s" +msgstr "书签" + +#: rhodecode/templates/changelog/changelog.html:95 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset_range.html:92 +#, fuzzy, python-format +msgid "Tag %s" +msgstr "标签" + +#: rhodecode/templates/changelog/changelog.html:100 #: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:79 -msgid "merge" -msgstr "合并" - -#: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:109 -#: rhodecode/templates/changeset/changeset_range.html:82 -#: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_add.html:33 -#: rhodecode/templates/files/files_edit.html:33 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -msgid "branch" +#: rhodecode/templates/changeset/changeset_range.html:80 +#, fuzzy, python-format +msgid "Branch %s" msgstr "分支" -#: rhodecode/templates/changelog/changelog.html:124 -#: rhodecode/templates/changeset/changeset_range.html:88 -msgid "bookmark" -msgstr "书签" - -#: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:114 -#: rhodecode/templates/changeset/changeset_range.html:94 -msgid "tag" -msgstr "标签" - -#: rhodecode/templates/changelog/changelog.html:302 +#: rhodecode/templates/changelog/changelog.html:258 msgid "There are no changes yet" msgstr "没有任何变更" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:94 -msgid "removed" +#: rhodecode/templates/changeset/changeset.html:91 +#, fuzzy +msgid "Removed" msgstr "移除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:95 -msgid "changed" +#: rhodecode/templates/changeset/changeset.html:92 +#, fuzzy +msgid "Changed" msgstr "修改" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:96 -msgid "added" +#: rhodecode/templates/changeset/changeset.html:93 +#, fuzzy +msgid "Added" msgstr "添加" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:98 -#: rhodecode/templates/changeset/changeset.html:99 -#: rhodecode/templates/changeset/changeset.html:100 -#, python-format -msgid "affected %s files" +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changeset/changeset.html:97 +#, fuzzy, python-format +msgid "Affected %s files" msgstr "影响%s文件" #: rhodecode/templates/changeset/changeset.html:6 @@ -3330,66 +3480,97 @@ msgid "%s Changeset" msgstr "%s修订集" -#: rhodecode/templates/changeset/changeset.html:14 -msgid "Changeset" -msgstr "修订集" - -#: rhodecode/templates/changeset/changeset.html:52 +#: rhodecode/templates/changeset/changeset.html:39 +msgid "No parents" +msgstr "无父版本" + +#: rhodecode/templates/changeset/changeset.html:49 msgid "No children" msgstr "无子对象" -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/diff_block.html:20 -msgid "raw diff" -msgstr "原始diff" - -#: rhodecode/templates/changeset/changeset.html:71 -msgid "patch diff" +#: rhodecode/templates/changeset/changeset.html:62 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:44 +msgid "Changeset status" +msgstr "修订集状态" + +#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/diff_block.html:23 +#, fuzzy +msgid "Raw diff" msgstr "原始diff" -#: rhodecode/templates/changeset/changeset.html:72 -#: rhodecode/templates/changeset/diff_block.html:21 -msgid "download diff" +#: rhodecode/templates/changeset/changeset.html:68 +#, fuzzy +msgid "Patch diff" +msgstr "原始diff" + +#: rhodecode/templates/changeset/changeset.html:69 +#: rhodecode/templates/changeset/diff_block.html:24 +#, fuzzy +msgid "Download diff" msgstr "下载diff" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d条评论" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "(%d内嵌)" -#: rhodecode/templates/changeset/changeset.html:122 -#: rhodecode/templates/compare/compare_diff.html:44 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:77 +msgid "merge" +msgstr "合并" + +#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/compare/compare_diff.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "修改%s个文件" -#: rhodecode/templates/changeset/changeset.html:124 -#: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/pullrequests/pullrequest_show.html:96 +#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/compare/compare_diff.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "修改%s个文件包括%s行插入和%s行删除" +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Showing a huge diff might take some time and resources" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +#, fuzzy +msgid "Show full diff" +msgstr "显示全部历史记录" + #: rhodecode/templates/changeset/changeset_file_comment.html:30 -#, python-format -msgid "Status from pull request %s" +#, fuzzy, python-format +msgid "Status change on pull request #%s" msgstr "所有拉取请求 %s" #: rhodecode/templates/changeset/changeset_file_comment.html:32 -#, python-format -msgid "Comment from pull request %s" +#, fuzzy, python-format +msgid "Comment on pull request #%s" msgstr "[评论]拉取请求 %s" #: rhodecode/templates/changeset/changeset_file_comment.html:57 @@ -3401,25 +3582,25 @@ msgstr "在{1}行上评论" #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:139 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "评论使用%s语法并支持%s" #: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:142 +#: rhodecode/templates/changeset/changeset_file_comment.html:141 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "在文本中使用 @用户名 以发送通知到该RhodeCode用户" #: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:162 +#: rhodecode/templates/changeset/changeset_file_comment.html:161 msgid "Comment" msgstr "评论" #: rhodecode/templates/changeset/changeset_file_comment.html:75 -#: rhodecode/templates/changeset/changeset_file_comment.html:86 -msgid "Hide" -msgstr "隐藏" +#, fuzzy +msgid "Cancel" +msgstr "修改" #: rhodecode/templates/changeset/changeset_file_comment.html:82 msgid "You need to be logged in to comment." @@ -3429,19 +3610,16 @@ msgid "Login now" msgstr "现在登陆" -#: rhodecode/templates/changeset/changeset_file_comment.html:137 -msgid "Leave a comment" -msgstr "发表评论" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "Check this to change current status of code-review for this changeset" -msgstr "勾选以改变这个修订集的代码审查状态" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "change status" +#: rhodecode/templates/changeset/changeset_file_comment.html:86 +msgid "Hide" +msgstr "隐藏" + +#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#, fuzzy +msgid "Change status" msgstr "改变状态" -#: rhodecode/templates/changeset/changeset_file_comment.html:164 +#: rhodecode/templates/changeset/changeset_file_comment.html:163 msgid "Comment and close" msgstr "评论并关闭" @@ -3450,69 +3628,78 @@ msgid "%s Changesets" msgstr "%s修订集" -#: rhodecode/templates/changeset/changeset_range.html:29 -#: rhodecode/templates/compare/compare_diff.html:29 -msgid "Compare View" -msgstr "比较显示" - -#: rhodecode/templates/changeset/changeset_range.html:29 -msgid "Show combined compare" -msgstr "显示紧凑比较" - -#: rhodecode/templates/changeset/changeset_range.html:54 +#: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" msgstr "影响文件" -#: rhodecode/templates/changeset/diff_block.html:19 -msgid "show full diff for this file" +#: rhodecode/templates/changeset/diff_block.html:22 +#, fuzzy +msgid "Show full diff for this file" msgstr "显示文件的完整差异" -#: rhodecode/templates/changeset/diff_block.html:27 -msgid "show inline comments" +#: rhodecode/templates/changeset/diff_block.html:30 +#, fuzzy +msgid "Show inline comments" msgstr "显示内嵌评论" -#: rhodecode/templates/compare/compare_cs.html:5 +#: rhodecode/templates/changeset/diff_block.html:55 +msgid "Show file at latest version in this repo" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:56 +msgid "Show file at initial version in this repo" +msgstr "" + +#: rhodecode/templates/compare/compare_cs.html:4 msgid "No changesets" msgstr "无修订" -#: rhodecode/templates/compare/compare_diff.html:37 -#: rhodecode/templates/pullrequests/pullrequest_show.html:87 +#: rhodecode/templates/compare/compare_cs.html:32 +#, fuzzy +msgid "Ancestor" +msgstr "分支" + +#: rhodecode/templates/compare/compare_diff.html:5 +#, fuzzy, python-format +msgid "%s Compare" +msgstr "比较显示" + +#: rhodecode/templates/compare/compare_diff.html:9 +#, fuzzy +msgid "Compare revisions" +msgstr "上一个修订" + +#: rhodecode/templates/compare/compare_diff.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:106 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "显示%s个提交" -#: rhodecode/templates/compare/compare_diff.html:52 -#: rhodecode/templates/pullrequests/pullrequest_show.html:102 +#: rhodecode/templates/compare/compare_diff.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:121 msgid "No files" msgstr "无文件" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 -msgid "Fork" -msgstr "复刻" +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +msgid "confirm to show potentially huge diff" +msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:54 -#: rhodecode/templates/summary/summary.html:77 +#: rhodecode/templates/summary/summary.html:69 msgid "Mercurial repository" msgstr "Mercurial版本库" #: rhodecode/templates/data_table/_dt_elements.html:56 -#: rhodecode/templates/summary/summary.html:80 +#: rhodecode/templates/summary/summary.html:72 msgid "Git repository" msgstr "Git版本库" -#: rhodecode/templates/data_table/_dt_elements.html:63 -#: rhodecode/templates/summary/summary.html:87 -msgid "public repository" -msgstr "公共版本库" - #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/summary/summary.html:96 -#: rhodecode/templates/summary/summary.html:97 -msgid "Fork of" -msgstr "复刻自" +#, fuzzy, python-format +msgid "Fork of %s" +msgstr "复刻名称%s" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3540,28 +3727,45 @@ msgid "Confirm to delete this user: %s" msgstr "确认删除用户：%s" -#: rhodecode/templates/email_templates/changeset_comment.html:10 -msgid "New status$" -msgstr "新状态$" +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:15 +msgid "New status" +msgstr "新状态" + +#: rhodecode/templates/email_templates/changeset_comment.html:11 +#: rhodecode/templates/email_templates/pull_request_comment.html:9 +msgid "View this comment here" +msgstr "查看评论" + +#: rhodecode/templates/email_templates/changeset_comment.html:14 +#, fuzzy +msgid "Repo" +msgstr "我的版本库" + +#: rhodecode/templates/email_templates/changeset_comment.html:16 +msgid "desc" +msgstr "" #: rhodecode/templates/email_templates/main.html:8 msgid "This is a notification from RhodeCode." msgstr "这是一个RhodeCode通知。" #: rhodecode/templates/email_templates/password_reset.html:4 -msgid "Hello" +#, fuzzy, python-format +msgid "Hello %s" msgstr "你好" -#: rhodecode/templates/email_templates/password_reset.html:6 +#: rhodecode/templates/email_templates/password_reset.html:5 msgid "We received a request to create a new password for your account." msgstr "我们收到重置你用户密码的请求。" -#: rhodecode/templates/email_templates/password_reset.html:8 +#: rhodecode/templates/email_templates/password_reset.html:6 msgid "You can generate it by clicking following URL" msgstr "点击下面的链接以重新生成密码：" -#: rhodecode/templates/email_templates/password_reset.html:12 -msgid "If you didn't request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:11 +#, fuzzy +msgid "If you did not request new password please ignore this email." msgstr "如果你没有要求重置密码，请忽略这封邮件。" #: rhodecode/templates/email_templates/pull_request.html:4 @@ -3572,34 +3776,30 @@ msgstr "用户%s在版本库%s中创建了一个拉取请求需要你检视" #: rhodecode/templates/email_templates/pull_request.html:5 -msgid "title" -msgstr "标题" +msgid "View this pull request here" +msgstr "查看拉取请求" #: rhodecode/templates/email_templates/pull_request.html:6 -#: rhodecode/templates/pullrequests/pullrequest.html:115 +msgid "title" +msgstr "标题" + +#: rhodecode/templates/email_templates/pull_request.html:7 msgid "description" msgstr "描述" -#: rhodecode/templates/email_templates/pull_request.html:7 -msgid "View this pull request here" -msgstr "查看拉取请求" - #: rhodecode/templates/email_templates/pull_request.html:12 msgid "revisions for reviewing" msgstr "待检视修订" -#: rhodecode/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "User %s commented on pull request #%s for repository %s" +#: rhodecode/templates/email_templates/pull_request_comment.html:3 +#, fuzzy, python-format +msgid "Pull request #%s for repository %s" msgstr "用户%s评论了版本库%s的拉取请求%s" -#: rhodecode/templates/email_templates/pull_request_comment.html:10 -msgid "New status" -msgstr "新状态" - -#: rhodecode/templates/email_templates/pull_request_comment.html:14 -msgid "View this comment here" -msgstr "查看评论" +#: rhodecode/templates/email_templates/pull_request_comment.html:13 +#, fuzzy +msgid "Closing pull request with status" +msgstr "拉取请求状态" #: rhodecode/templates/email_templates/registration.html:4 msgid "A new user have registered in RhodeCode" @@ -3609,109 +3809,115 @@ msgid "View this user here" msgstr "查看用户" -#: rhodecode/templates/errors/error_document.html:46 +#: rhodecode/templates/errors/error_document.html:55 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "重定向到%s，于%s秒后" #: rhodecode/templates/files/file_diff.html:4 -#, python-format -msgid "%s File diff" +#, fuzzy, python-format +msgid "%s File Diff" msgstr "%s文件差异" -#: rhodecode/templates/files/file_diff.html:12 +#: rhodecode/templates/files/file_diff.html:8 msgid "File diff" msgstr "文件差异" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:74 -#, python-format -msgid "%s files" +#: rhodecode/templates/files/files.html:76 +#, fuzzy, python-format +msgid "%s Files" msgstr "%s文件" -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:351 -msgid "files" -msgstr "文件" +#: rhodecode/templates/files/files.html:30 +#: rhodecode/templates/files/files_add.html:31 +#: rhodecode/templates/files/files_edit.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +#, fuzzy +msgid "Branch" +msgstr "分支" #: rhodecode/templates/files/files_add.html:4 -#: rhodecode/templates/files/files_edit.html:4 -#, python-format -msgid "%s Edit file" -msgstr "%s编辑文件" +#, fuzzy, python-format +msgid "%s Files Add" +msgstr "%s文件" #: rhodecode/templates/files/files_add.html:19 -msgid "add file" +#, fuzzy +msgid "Add file" msgstr "新建文件" -#: rhodecode/templates/files/files_add.html:40 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:78 msgid "Add new file" msgstr "新建文件" -#: rhodecode/templates/files/files_add.html:45 +#: rhodecode/templates/files/files_add.html:43 msgid "File Name" msgstr "文件名" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:56 msgid "or" msgstr "或者" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:54 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:52 msgid "Upload file" msgstr "上传文件" -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:56 msgid "Create new file" msgstr "创建新文件" -#: rhodecode/templates/files/files_add.html:63 -#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_add.html:61 +#: rhodecode/templates/files/files_edit.html:37 #: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "位置" -#: rhodecode/templates/files/files_add.html:67 +#: rhodecode/templates/files/files_add.html:65 msgid "use / to separate directories" msgstr "使用 / 目录分隔符" -#: rhodecode/templates/files/files_add.html:77 -#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 #: rhodecode/templates/shortlog/shortlog_data.html:6 -msgid "commit message" +#, fuzzy +msgid "Commit message" msgstr "提交信息" -#: rhodecode/templates/files/files_add.html:81 -#: rhodecode/templates/files/files_edit.html:67 +#: rhodecode/templates/files/files_add.html:79 +#: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "提交修改" #: rhodecode/templates/files/files_browser.html:13 -msgid "view" +#, fuzzy +msgid "View" msgstr "显示" #: rhodecode/templates/files/files_browser.html:14 -msgid "previous revision" +#, fuzzy +msgid "Previous revision" msgstr "上一个修订" #: rhodecode/templates/files/files_browser.html:16 -msgid "next revision" +#, fuzzy +msgid "Next revision" msgstr "下一个修订" #: rhodecode/templates/files/files_browser.html:23 -msgid "follow current branch" +#, fuzzy +msgid "Follow current branch" msgstr "沿着当前分支" #: rhodecode/templates/files/files_browser.html:27 -msgid "search file list" +#, fuzzy +msgid "Search file list" msgstr "搜索文件列表" -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -msgid "add new file" -msgstr "新建文件" - #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." msgstr "加载文件列表..." @@ -3736,31 +3942,41 @@ msgid "Last committer" msgstr "最后提交者" +#: rhodecode/templates/files/files_edit.html:4 +#, fuzzy, python-format +msgid "%s Files Edit" +msgstr "%s文件" + #: rhodecode/templates/files/files_edit.html:19 -msgid "edit file" +#, fuzzy +msgid "Edit file" msgstr "编辑文件" -#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -msgid "show annotation" +#, fuzzy +msgid "Show annotation" msgstr "显示注释" -#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_edit.html:48 #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 -msgid "show as raw" +#, fuzzy +msgid "Show as raw" msgstr "显示原始文件" -#: rhodecode/templates/files/files_edit.html:51 +#: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -msgid "download as raw" +#, fuzzy +msgid "Download as raw" msgstr "下载原始文件" -#: rhodecode/templates/files/files_edit.html:54 -msgid "source" +#: rhodecode/templates/files/files_edit.html:52 +#, fuzzy +msgid "Source" msgstr "显示源文件" -#: rhodecode/templates/files/files_edit.html:59 +#: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" msgstr "编辑文件" @@ -3769,15 +3985,18 @@ msgstr "历史" #: rhodecode/templates/files/files_history_box.html:9 -msgid "diff to revision" +#, fuzzy +msgid "Diff to revision" msgstr "比较差异" #: rhodecode/templates/files/files_history_box.html:10 -msgid "show at revision" +#, fuzzy +msgid "Show at revision" msgstr "显示修订" #: rhodecode/templates/files/files_history_box.html:11 -msgid "show full history" +#, fuzzy +msgid "Show full history" msgstr "显示全部历史记录" #: rhodecode/templates/files/files_history_box.html:16 @@ -3791,17 +4010,19 @@ msgstr "加载文件历史记录..." #: rhodecode/templates/files/files_source.html:21 -msgid "show source" +#, fuzzy +msgid "Show source" msgstr "显示代码" #: rhodecode/templates/files/files_source.html:29 #, fuzzy, python-format -msgid "edit on branch:%s" +msgid "Edit on branch:%s" msgstr "已经删除分支%s" #: rhodecode/templates/files/files_source.html:31 -msgid "edit on branch:?" -msgstr "" +#, fuzzy +msgid "Edit on branch:?" +msgstr "已经删除分支%s" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -3833,8 +4054,10 @@ msgid "%s Followers" msgstr "%s个关注者" -#: rhodecode/templates/followers/followers.html:13 -msgid "followers" +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:184 +msgid "Followers" msgstr "关注者" #: rhodecode/templates/followers/followers_data.html:12 @@ -3846,32 +4069,33 @@ msgid "%s Fork" msgstr "%s的复刻" -#: rhodecode/templates/forks/fork.html:31 +#: rhodecode/templates/forks/fork.html:28 msgid "Fork name" msgstr "复刻名称" -#: rhodecode/templates/forks/fork.html:68 +#: rhodecode/templates/forks/fork.html:65 msgid "Private" msgstr "私有" -#: rhodecode/templates/forks/fork.html:77 +#: rhodecode/templates/forks/fork.html:74 msgid "Copy permissions" msgstr "拷贝权限" -#: rhodecode/templates/forks/fork.html:81 +#: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" msgstr "从被复刻版本库拷贝权限" -#: rhodecode/templates/forks/fork.html:86 +#: rhodecode/templates/forks/fork.html:84 msgid "Update after clone" msgstr "克隆后更新" -#: rhodecode/templates/forks/fork.html:90 +#: rhodecode/templates/forks/fork.html:88 msgid "Checkout source after making a clone" msgstr "完成克隆后检出源代码" -#: rhodecode/templates/forks/fork.html:94 -msgid "fork this repository" +#: rhodecode/templates/forks/fork.html:93 +#, fuzzy +msgid "Fork this repository" msgstr "复刻该版本库" #: rhodecode/templates/forks/forks.html:5 @@ -3879,18 +4103,17 @@ msgid "%s Forks" msgstr "%s个复刻" -#: rhodecode/templates/forks/forks.html:13 -msgid "forks" +#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/summary/summary.html:189 +#: rhodecode/templates/summary/summary.html:190 +msgid "Forks" msgstr "复刻" #: rhodecode/templates/forks/forks_data.html:17 -msgid "forked" +#, fuzzy +msgid "Forked" msgstr "已有复刻" -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "比较复刻" - #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "无复刻" @@ -3904,21 +4127,15 @@ msgstr "订阅日志RSS" #: rhodecode/templates/journal/journal.html:32 -#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "刷新" #: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 -msgid "RSS feed" -msgstr "订阅RSS" - -#: rhodecode/templates/journal/journal.html:38 -#: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "订阅ATOM" -#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:51 msgid "Watched" msgstr "关注的" @@ -3926,6 +4143,11 @@ msgid "No entries yet" msgstr "没有条目" +#: rhodecode/templates/journal/public_journal.html:4 +#: rhodecode/templates/journal/public_journal.html:21 +msgid "Public Journal" +msgstr "公共日志" + #: rhodecode/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "订阅公共日志ATOM" @@ -3934,151 +4156,131 @@ msgid "RSS public journal feed" msgstr "订阅公共日志RSS" -#: rhodecode/templates/journal/public_journal.html:21 -msgid "Public Journal" -msgstr "公共日志" - #: rhodecode/templates/pullrequests/pullrequest.html:4 -#: rhodecode/templates/pullrequests/pullrequest.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" msgstr "新建拉取请求" -#: rhodecode/templates/pullrequests/pullrequest.html:54 -msgid "refresh overview" -msgstr "刷新概览" - -#: rhodecode/templates/pullrequests/pullrequest.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:52 msgid "Detailed compare view" msgstr "详细比较显示" -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:118 +#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "拉取请求检视人员" -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "所有者" -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:145 +#: rhodecode/templates/pullrequests/pullrequest.html:77 msgid "Add reviewer to this pull request." msgstr "为这个拉取请求增加检视人员" -#: rhodecode/templates/pullrequests/pullrequest.html:97 +#: rhodecode/templates/pullrequests/pullrequest.html:83 msgid "Create new pull request" msgstr "创建新的拉取请求" -#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest.html:92 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "标题" -#: rhodecode/templates/pullrequests/pullrequest.html:123 +#: rhodecode/templates/pullrequests/pullrequest.html:109 msgid "Send pull request" msgstr "发送拉取请求" -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "Closed %s" -msgstr "于%s前关闭" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "with status %s" -msgstr "状态%s" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:31 -msgid "Status" -msgstr "状态" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:36 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#, fuzzy, python-format +msgid "%s Pull Request #%s" +msgstr "拉取请求#%s" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#, fuzzy +msgid "Review status" +msgstr "新状态" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" msgstr "拉取请求状态" -#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" msgstr "还未检视的检视人员" -#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d个检视者" -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 -msgid "pull request was reviewed by all reviewers" +#: rhodecode/templates/pullrequests/pullrequest_show.html:59 +#, fuzzy +msgid "Pull request was reviewed by all reviewers" msgstr "拉取请求已经由所有检视人员检视" -#: rhodecode/templates/pullrequests/pullrequest_show.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Origin repository" msgstr "Git版本库" -#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" msgstr "创建于" -#: rhodecode/templates/pullrequests/pullrequest_show.html:83 +#: rhodecode/templates/pullrequests/pullrequest_show.html:102 msgid "Compare view" msgstr "比较显示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "reviewer" msgstr "检视者" +#: rhodecode/templates/pullrequests/pullrequest_show.html:164 +#, fuzzy +msgid "Add or remove reviewer to this pull request." +msgstr "为这个拉取请求增加检视人员" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:168 +#, fuzzy +msgid "Save changes" +msgstr "无变更" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -msgid "all pull requests" -msgstr "所有拉取请求" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 -msgid "All pull requests" -msgstr "所有拉取请求" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 -msgid "Closed" -msgstr "已关闭" +#, fuzzy, python-format +msgid "%s Pull Requests" +msgstr "我的拉取请求" #: rhodecode/templates/search/search.html:6 -#, python-format -msgid "Search \"%s\" in repository: %s" -msgstr "搜索 \"%s\" 于版本库 %s 中" +#, fuzzy +msgid "Search repository" +msgstr "在版本库%s中搜索" #: rhodecode/templates/search/search.html:8 -#, python-format -msgid "Search \"%s\" in all repositories" -msgstr "在所有的版本库中搜索 \"%s\"" - -#: rhodecode/templates/search/search.html:12 -#: rhodecode/templates/search/search.html:32 -#, python-format -msgid "Search in repository: %s" -msgstr "在版本库%s中搜索" - -#: rhodecode/templates/search/search.html:14 -#: rhodecode/templates/search/search.html:34 +#: rhodecode/templates/search/search.html:16 msgid "Search in all repositories" msgstr "在所有的版本库中搜索" -#: rhodecode/templates/search/search.html:48 +#: rhodecode/templates/search/search.html:50 msgid "Search term" msgstr "搜索短语" -#: rhodecode/templates/search/search.html:60 +#: rhodecode/templates/search/search.html:62 msgid "Search in" msgstr "搜索范围" -#: rhodecode/templates/search/search.html:63 +#: rhodecode/templates/search/search.html:65 msgid "File contents" msgstr "文件内容" -#: rhodecode/templates/search/search.html:64 +#: rhodecode/templates/search/search.html:66 msgid "Commit messages" msgstr "提交信息" -#: rhodecode/templates/search/search.html:65 +#: rhodecode/templates/search/search.html:67 msgid "File names" msgstr "文件名" @@ -4088,40 +4290,26 @@ msgid "Permission denied" msgstr "权限不足" -#: rhodecode/templates/settings/repo_settings.html:5 -#, python-format -msgid "%s Settings" -msgstr "%s设置" - -#: rhodecode/templates/settings/repo_settings.html:102 -msgid "Delete repository" -msgstr "删除版本库" - -#: rhodecode/templates/settings/repo_settings.html:109 -msgid "Remove repo" -msgstr "删除版本库" - #: rhodecode/templates/shortlog/shortlog.html:5 -#, python-format -msgid "%s Shortlog" -msgstr "%s简短日志" - +#, fuzzy, python-format +msgid "%s Lightweight Changelog" +msgstr "使用轻量的控制面板" + +#: rhodecode/templates/shortlog/shortlog.html:11 #: rhodecode/templates/shortlog/shortlog.html:15 -#: rhodecode/templates/shortlog/shortlog.html:19 -msgid "shortlog" -msgstr "简短日志" - -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "修订" +#, fuzzy +msgid "Lightweight Changelog" +msgstr "使用轻量的控制面板" #: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "age" +#, fuzzy +msgid "Age" msgstr "时间" -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "作者" +#: rhodecode/templates/shortlog/shortlog_data.html:20 +#, python-format +msgid "Click to open associated pull request #%s" +msgstr "点击建立相关的拉取请求 #%s" #: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" @@ -4140,156 +4328,170 @@ msgid "%s Summary" msgstr "%s概要" -#: rhodecode/templates/summary/summary.html:12 -msgid "summary" -msgstr "概要" - -#: rhodecode/templates/summary/summary.html:20 -#, python-format -msgid "repo %s ATOM feed" -msgstr "订阅ATOM %s" - -#: rhodecode/templates/summary/summary.html:21 -#, python-format -msgid "repo %s RSS feed" -msgstr "订阅RSS %s" - -#: rhodecode/templates/summary/summary.html:49 -#: rhodecode/templates/summary/summary.html:52 -msgid "ATOM" -msgstr "ATOM" - -#: rhodecode/templates/summary/summary.html:70 +#: rhodecode/templates/summary/summary.html:16 +#, fuzzy, python-format +msgid "%s ATOM feed" +msgstr "%s %s订阅" + +#: rhodecode/templates/summary/summary.html:17 +#, fuzzy, python-format +msgid "%s RSS feed" +msgstr "%s %s订阅" + +#: rhodecode/templates/summary/summary.html:62 #, python-format msgid "Repository locked by %s" msgstr "版本库由%s锁定" -#: rhodecode/templates/summary/summary.html:72 +#: rhodecode/templates/summary/summary.html:64 msgid "Repository unlocked" msgstr "版本库未锁定" -#: rhodecode/templates/summary/summary.html:91 +#: rhodecode/templates/summary/summary.html:83 #, python-format msgid "Non changable ID %s" msgstr "不可变ID %s" -#: rhodecode/templates/summary/summary.html:96 -msgid "public" +#: rhodecode/templates/summary/summary.html:88 +#, fuzzy +msgid "Public" msgstr "公共" -#: rhodecode/templates/summary/summary.html:104 -msgid "remote clone" +#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:89 +msgid "Fork of" +msgstr "复刻自" + +#: rhodecode/templates/summary/summary.html:96 +#, fuzzy +msgid "Remote clone" msgstr "远程克隆" -#: rhodecode/templates/summary/summary.html:125 +#: rhodecode/templates/summary/summary.html:117 msgid "Contact" msgstr "联系方式" -#: rhodecode/templates/summary/summary.html:139 +#: rhodecode/templates/summary/summary.html:131 msgid "Clone url" msgstr "克隆地址" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:136 msgid "Show by Name" msgstr "以名字显示" -#: rhodecode/templates/summary/summary.html:143 +#: rhodecode/templates/summary/summary.html:137 msgid "Show by ID" msgstr "按ID显示" +#: rhodecode/templates/summary/summary.html:143 +msgid "Trending files" +msgstr "文件趋势图" + #: rhodecode/templates/summary/summary.html:151 -msgid "Trending files" -msgstr "文件趋势图" +#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "启用" #: rhodecode/templates/summary/summary.html:159 -#: rhodecode/templates/summary/summary.html:175 -#: rhodecode/templates/summary/summary.html:203 -msgid "enable" -msgstr "启用" - -#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "下载" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:163 msgid "There are no downloads yet" msgstr "无下载" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:165 msgid "Downloads are disabled for this repository" msgstr "这个版本库的下载已经禁用" -#: rhodecode/templates/summary/summary.html:179 +#: rhodecode/templates/summary/summary.html:171 msgid "Download as zip" msgstr "zip打包下载" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" msgstr "勾选以下载包含子版本库的压缩包" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "with subrepos" msgstr "包括子版本库" -#: rhodecode/templates/summary/summary.html:195 +#: rhodecode/templates/summary/summary.html:197 +#, fuzzy +msgid "Repository Size" +msgstr "版本库" + +#: rhodecode/templates/summary/summary.html:204 +#: rhodecode/templates/summary/summary.html:206 +#, fuzzy +msgid "Feed" +msgstr "订阅RSS" + +#: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "按日期或作者的提交活动" -#: rhodecode/templates/summary/summary.html:206 +#: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "已收集的统计：" -#: rhodecode/templates/summary/summary.html:227 -msgid "Shortlog" -msgstr "简短日志" - -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:256 +#, fuzzy +msgid "Latest changes" +msgstr "最后修改" + +#: rhodecode/templates/summary/summary.html:258 msgid "Quick start" msgstr "快速入门" -#: rhodecode/templates/summary/summary.html:243 +#: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file at revision '%s'" msgstr "修订'%s'中的README" -#: rhodecode/templates/summary/summary.html:246 +#: rhodecode/templates/summary/summary.html:275 msgid "Permalink to this readme" msgstr "这个README的永久链接" -#: rhodecode/templates/summary/summary.html:304 +#: rhodecode/templates/summary/summary.html:333 #, python-format msgid "Download %s as %s" msgstr "下载%s为%s包" -#: rhodecode/templates/summary/summary.html:661 +#: rhodecode/templates/summary/summary.html:380 +msgid "files" +msgstr "文件" + +#: rhodecode/templates/summary/summary.html:690 msgid "commits" msgstr "提交" -#: rhodecode/templates/summary/summary.html:662 +#: rhodecode/templates/summary/summary.html:691 msgid "files added" msgstr "文件已添加" -#: rhodecode/templates/summary/summary.html:663 +#: rhodecode/templates/summary/summary.html:692 msgid "files changed" msgstr "文件已更改" -#: rhodecode/templates/summary/summary.html:664 +#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "文件已删除" -#: rhodecode/templates/summary/summary.html:667 +#: rhodecode/templates/summary/summary.html:695 msgid "commit" msgstr "提交" -#: rhodecode/templates/summary/summary.html:668 +#: rhodecode/templates/summary/summary.html:696 msgid "file added" msgstr "文件已添加" -#: rhodecode/templates/summary/summary.html:669 +#: rhodecode/templates/summary/summary.html:697 msgid "file changed" msgstr "文件已更改" -#: rhodecode/templates/summary/summary.html:670 +#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "文件已删除" @@ -4298,7 +4500,7 @@ msgid "%s Tags" msgstr "%s标签" -#: rhodecode/templates/tags/tags.html:29 +#: rhodecode/templates/tags/tags.html:26 msgid "Compare tags" msgstr "比较标签"
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Fri Apr 05 14:09:23 2013 +0200 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Fri Apr 05 19:21:52 2013 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-01-28 00:24+0100\n" +"POT-Creation-Date: 2013-04-05 10:17-0700\n" "PO-Revision-Date: 2012-05-09 22:23+0800\n" "Last-Translator: Nansen <nansenat16@gmail.com>\n" "Language-Team: zh_TW <LL@li.org>\n" @@ -23,11 +23,11 @@ msgstr "分支" #: rhodecode/controllers/changeset.py:83 -msgid "show white space" +msgid "Show white space" msgstr "" #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 -msgid "ignore white space" +msgid "Ignore white space" msgstr "" #: rhodecode/controllers/changeset.py:163 @@ -36,7 +36,7 @@ msgstr "文件內容" #: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:416 +#: rhodecode/controllers/pullrequests.py:438 #, fuzzy, python-format msgid "Status change -> %s" msgstr "最後修改" @@ -47,8 +47,8 @@ "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:121 +#: rhodecode/controllers/compare.py:74 +#: rhodecode/controllers/pullrequests.py:167 #: rhodecode/controllers/shortlog.py:100 #, fuzzy msgid "There are no changesets yet" @@ -91,111 +91,120 @@ msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:137 -#: rhodecode/templates/changeset/changeset.html:149 -#: rhodecode/templates/compare/compare_diff.html:62 -#: rhodecode/templates/compare/compare_diff.html:73 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 -#: rhodecode/templates/pullrequests/pullrequest_show.html:171 +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Changeset was too big and was cut off..." msgstr "" -#: rhodecode/controllers/feed.py:92 -#, fuzzy -msgid "commited on" +#: rhodecode/controllers/feed.py:91 +#, fuzzy, python-format +msgid "%s committed on %s" msgstr "遞交" -#: rhodecode/controllers/files.py:86 -#, fuzzy -msgid "click here to add new file" +#: rhodecode/controllers/files.py:88 +#, fuzzy +msgid "Click here to add new file" msgstr "新增使用者" -#: rhodecode/controllers/files.py:87 +#: rhodecode/controllers/files.py:89 #, fuzzy, python-format msgid "There are no files yet %s" msgstr "尚未有任何檔案" -#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338 +#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:281 +#: rhodecode/controllers/files.py:279 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:295 +#: rhodecode/controllers/files.py:293 #, fuzzy, python-format msgid "Edited file %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:311 +#: rhodecode/controllers/files.py:309 msgid "No changes" msgstr "沒有修改" -#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384 +#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390 +#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:350 +#: rhodecode/controllers/files.py:347 #, fuzzy msgid "Added file via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:370 +#: rhodecode/controllers/files.py:364 #, fuzzy msgid "No content" msgstr "文件內容" -#: rhodecode/controllers/files.py:374 +#: rhodecode/controllers/files.py:368 #, fuzzy msgid "No filename" msgstr "檔案名稱" -#: rhodecode/controllers/files.py:416 -msgid "downloads disabled" +#: rhodecode/controllers/files.py:372 +msgid "Location must be relative path and must not contain .. in path" +msgstr "" + +#: rhodecode/controllers/files.py:420 +#, fuzzy +msgid "Downloads disabled" msgstr "下載已關閉" -#: rhodecode/controllers/files.py:427 +#: rhodecode/controllers/files.py:431 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: rhodecode/controllers/files.py:429 +#: rhodecode/controllers/files.py:433 msgid "Empty repository" msgstr "空的版本庫" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:435 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: rhodecode/controllers/files.py:576 -#: rhodecode/templates/changeset/changeset_range.html:13 -#: rhodecode/templates/changeset/changeset_range.html:31 +#: rhodecode/controllers/files.py:617 +#: rhodecode/templates/changeset/changeset_range.html:9 msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564 +#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 +#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78 -#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575 +#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 +#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:165 -#, python-format -msgid "forked %s repository as %s" +#: rhodecode/controllers/forks.py:175 +#, fuzzy, python-format +msgid "Forked repository %s as %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/forks.py:179 +#: rhodecode/controllers/forks.py:189 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -206,53 +215,74 @@ msgstr "公開日誌" #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 -#: rhodecode/templates/base/base.html:238 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "日誌" -#: rhodecode/controllers/login.py:142 -msgid "You have successfully registered into rhodecode" +#: rhodecode/controllers/login.py:138 +#, fuzzy +msgid "You have successfully registered into RhodeCode" msgstr "您已經成功註冊rhodecode" -#: rhodecode/controllers/login.py:163 +#: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" msgstr "您的密碼重設連結已寄出" -#: rhodecode/controllers/login.py:183 +#: rhodecode/controllers/login.py:179 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570 +#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/email_templates/changeset_comment.html:15 +msgid "Changeset" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:128 +msgid "Special" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:129 +#, fuzzy +msgid "Peer branches" +msgstr "分支" + +#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:190 +#: rhodecode/controllers/pullrequests.py:228 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:192 -#, fuzzy -msgid "error during creation of pull request" +#: rhodecode/controllers/pullrequests.py:230 +#, fuzzy +msgid "Error creating pull request" msgstr "建立使用者 %s" -#: rhodecode/controllers/pullrequests.py:224 +#: rhodecode/controllers/pullrequests.py:251 #, fuzzy msgid "Successfully opened new pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:227 +#: rhodecode/controllers/pullrequests.py:254 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:260 +#: rhodecode/controllers/pullrequests.py:287 #, fuzzy msgid "Successfully deleted pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:451 +#: rhodecode/controllers/pullrequests.py:441 +msgid "Closing with" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:478 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" @@ -268,57 +298,12 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:120 -#: rhodecode/controllers/admin/repos.py:254 -#, python-format -msgid "Repository %s updated successfully" -msgstr "版本庫 %s 更新完成" - -#: rhodecode/controllers/settings.py:138 -#: rhodecode/controllers/admin/repos.py:272 -#, python-format -msgid "error occurred during update of repository %s" -msgstr "" - -#: rhodecode/controllers/settings.py:163 -#: rhodecode/controllers/admin/repos.py:297 -#, python-format -msgid "deleted repository %s" -msgstr "刪除版本庫 %s" - -#: rhodecode/controllers/settings.py:167 -#: rhodecode/controllers/admin/repos.py:307 -#: rhodecode/controllers/admin/repos.py:313 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "" - -#: rhodecode/controllers/settings.py:186 -#, fuzzy -msgid "unlocked" -msgstr "解鎖" - -#: rhodecode/controllers/settings.py:189 -#, fuzzy -msgid "locked" -msgstr "解鎖" - -#: rhodecode/controllers/settings.py:191 -#, fuzzy, python-format -msgid "Repository has been %s" -msgstr "forked %s 版本庫為 %s" - -#: rhodecode/controllers/settings.py:195 -#: rhodecode/controllers/admin/repos.py:405 -msgid "An error occurred during unlocking" -msgstr "" - -#: rhodecode/controllers/summary.py:140 +#: rhodecode/controllers/summary.py:141 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:144 -#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/controllers/summary.py:147 +#: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" @@ -328,7 +313,7 @@ msgstr "LDAP設定更新完成" #: rhodecode/controllers/admin/defaults.py:110 -msgid "error occurred during update of defaults" +msgid "Error occurred during update of defaults" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:50 @@ -384,7 +369,7 @@ msgstr "無法啟用LDAP。找不到python-ldap函式庫" #: rhodecode/controllers/admin/ldap_settings.py:147 -msgid "error occurred during update of ldap settings" +msgid "Error occurred during update of ldap settings" msgstr "" #: rhodecode/controllers/admin/permissions.py:60 @@ -407,45 +392,46 @@ #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 -#: rhodecode/templates/admin/repos/repo_add.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:9 +#: rhodecode/templates/admin/repos/repo_add.html:10 +#: rhodecode/templates/admin/repos/repo_add.html:14 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:133 #: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/admin/users/users.html:85 #: 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:203 -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 +#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:300 msgid "Admin" msgstr "管理" #: rhodecode/controllers/admin/permissions.py:70 -msgid "disabled" -msgstr "停用" - -#: rhodecode/controllers/admin/permissions.py:72 -msgid "allowed with manual account activation" -msgstr "允許手動啟用帳號" - -#: rhodecode/controllers/admin/permissions.py:74 -msgid "allowed with automatic account activation" -msgstr "允許自動啟用帳號" - #: rhodecode/controllers/admin/permissions.py:76 #: rhodecode/controllers/admin/permissions.py:79 msgid "Disabled" msgstr "停用" +#: rhodecode/controllers/admin/permissions.py:72 +#, fuzzy +msgid "Allowed with manual account activation" +msgstr "允許手動啟用帳號" + +#: rhodecode/controllers/admin/permissions.py:74 +#, fuzzy +msgid "Allowed with automatic account activation" +msgstr "允許自動啟用帳號" + #: rhodecode/controllers/admin/permissions.py:77 #: rhodecode/controllers/admin/permissions.py:80 msgid "Enabled" @@ -456,156 +442,230 @@ msgstr "預設權限更新完成" #: rhodecode/controllers/admin/permissions.py:142 -msgid "error occurred during update of permissions" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:123 +msgid "Error occurred during update of permissions" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:127 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:162 -#, python-format -msgid "created repository %s from %s" +#: rhodecode/controllers/admin/repos.py:168 +#, fuzzy, python-format +msgid "Created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:166 -#, python-format -msgid "created repository %s" +#: rhodecode/controllers/admin/repos.py:174 +#, fuzzy, python-format +msgid "Created repository %s" msgstr "建立版本庫 %s" #: rhodecode/controllers/admin/repos.py:197 +#, fuzzy, python-format +msgid "Error creating repository %s" +msgstr "建立版本庫 %s" + +#: rhodecode/controllers/admin/repos.py:266 #, python-format -msgid "error occurred during creation of repository %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:302 +msgid "Repository %s updated successfully" +msgstr "版本庫 %s 更新完成" + +#: rhodecode/controllers/admin/repos.py:284 +#, fuzzy, python-format +msgid "Error occurred during update of repository %s" +msgstr "建立版本庫 %s" + +#: rhodecode/controllers/admin/repos.py:311 +#: rhodecode/controllers/api/api.py:877 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/api/api.py:879 +#, fuzzy, python-format +msgid "Deleted %s forks" +msgstr "刪除版本庫 %s" + +#: rhodecode/controllers/admin/repos.py:319 +#, fuzzy, python-format +msgid "Deleted repository %s" +msgstr "刪除版本庫 %s" + +#: rhodecode/controllers/admin/repos.py:322 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:327 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:365 +#, fuzzy +msgid "Repository permissions updated" +msgstr "版本庫建立" + +#: rhodecode/controllers/admin/repos.py:384 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:350 -msgid "An error occurred during deletion of repository users groups" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:368 +#: rhodecode/controllers/admin/repos.py:403 +msgid "An error occurred during deletion of repository user groups" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:421 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:438 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:425 +#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:485 +msgid "An error occurred during unlocking" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:476 +#, fuzzy +msgid "Unlocked" +msgstr "解鎖" + +#: rhodecode/controllers/admin/repos.py:479 +#, fuzzy +msgid "Locked" +msgstr "解鎖" + +#: rhodecode/controllers/admin/repos.py:481 +#, fuzzy, python-format +msgid "Repository has been %s" +msgstr "forked %s 版本庫為 %s" + +#: rhodecode/controllers/admin/repos.py:505 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:509 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301 +#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:447 +#: rhodecode/controllers/admin/repos.py:527 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:449 +#: rhodecode/controllers/admin/repos.py:529 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:465 +#: rhodecode/controllers/admin/repos.py:545 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:547 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:471 +#: rhodecode/controllers/admin/repos.py:551 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:136 -#, python-format -msgid "created repos group %s" +#: rhodecode/controllers/admin/repos.py:590 +#, fuzzy +msgid "An error occurred during creation of field" +msgstr "建立使用者 %s" + +#: rhodecode/controllers/admin/repos.py:604 +msgid "An error occurred during removal of field" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:145 +#, fuzzy, python-format +msgid "Created repository group %s" msgstr "建立版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:148 -#, python-format -msgid "error occurred during creation of repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:205 -#, python-format -msgid "updated repos group %s" -msgstr "更新版本庫群組 %s" +#: rhodecode/controllers/admin/repos_groups.py:157 +#, fuzzy, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "建立使用者 %s" + +#: rhodecode/controllers/admin/repos_groups.py:214 +#: rhodecode/controllers/admin/repos_groups.py:286 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:220 +#, fuzzy, python-format +msgid "Updated repository group %s" +msgstr "更新版本庫群組 %s" + +#: rhodecode/controllers/admin/repos_groups.py:235 #, python-format -msgid "error occurred during update of repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:238 +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:253 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:246 -#, python-format -msgid "removed repos group %s" -msgstr "移除版本庫群組 %s" - -#: rhodecode/controllers/admin/repos_groups.py:252 -msgid "Cannot delete this group it still contains subgroups" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:257 -#: rhodecode/controllers/admin/repos_groups.py:262 +#: rhodecode/controllers/admin/repos_groups.py:260 #, python-format -msgid "error occurred during deletion of repos group %s" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:283 +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:266 +#, fuzzy, python-format +msgid "Removed repository group %s" +msgstr "移除版本庫群組 %s" + +#: rhodecode/controllers/admin/repos_groups.py:271 +#, fuzzy, python-format +msgid "Error occurred during deletion of repos group %s" +msgstr "建立使用者 %s" + +#: rhodecode/controllers/admin/repos_groups.py:297 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:304 -msgid "An error occurred during deletion of group users groups" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:124 +#: rhodecode/controllers/admin/repos_groups.py:318 +#, fuzzy +msgid "An error occurred during deletion of group user groups" +msgstr "建立使用者 %s" + +#: rhodecode/controllers/admin/settings.py:126 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:133 +#: rhodecode/controllers/admin/settings.py:135 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:166 msgid "Updated application settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:170 #: rhodecode/controllers/admin/settings.py:301 -msgid "error occurred during updating application settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:209 +#, fuzzy +msgid "Error occurred during updating application settings" +msgstr "更新應用設定" + +#: rhodecode/controllers/admin/settings.py:216 #, fuzzy msgid "Updated visualisation settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:214 -msgid "error occurred during updating visualisation settings" -msgstr "" +#: rhodecode/controllers/admin/settings.py:221 +#, fuzzy +msgid "Error occurred during updating visualisation settings" +msgstr "更新應用設定" #: rhodecode/controllers/admin/settings.py:297 #, fuzzy @@ -621,43 +681,44 @@ msgstr "更新hook" #: rhodecode/controllers/admin/settings.py:327 -msgid "error occurred during hook creation" +msgid "Error occurred during hook creation" msgstr "" #: rhodecode/controllers/admin/settings.py:346 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:408 +#: rhodecode/controllers/admin/settings.py:410 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:448 +#: rhodecode/controllers/admin/settings.py:452 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:463 +#: rhodecode/controllers/admin/settings.py:467 #: rhodecode/controllers/admin/users.py:198 #, python-format -msgid "error occurred during update of user %s" +msgid "Error occurred during update of user %s" msgstr "" #: rhodecode/controllers/admin/users.py:130 -#, python-format -msgid "created user %s" +#, fuzzy, python-format +msgid "Created user %s" msgstr "建立使用者 %s" #: rhodecode/controllers/admin/users.py:142 -#, python-format -msgid "error occurred during creation of user %s" -msgstr "" +#, fuzzy, python-format +msgid "Error occurred during creation of user %s" +msgstr "建立使用者 %s" #: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "使用者更新完成" #: rhodecode/controllers/admin/users.py:214 -msgid "successfully deleted user" +#, fuzzy +msgid "Successfully deleted user" msgstr "成功刪除使用者" #: rhodecode/controllers/admin/users.py:219 @@ -687,7 +748,7 @@ msgstr "版本庫權限" #: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:279 +#: rhodecode/controllers/admin/users_groups.py:281 msgid "An error occurred during permissions saving" msgstr "" @@ -720,228 +781,233 @@ msgstr "移除版本庫群組 %s" #: rhodecode/controllers/admin/users_groups.py:86 -#, python-format -msgid "created users group %s" +#, fuzzy, python-format +msgid "Created user group %s" msgstr "建立使用者群組 %s" #: rhodecode/controllers/admin/users_groups.py:97 -#, python-format -msgid "error occurred during creation of users group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:164 -#, python-format -msgid "updated users group %s" +#, fuzzy, python-format +msgid "Error occurred during creation of user group %s" +msgstr "建立使用者 %s" + +#: rhodecode/controllers/admin/users_groups.py:166 +#, fuzzy, python-format +msgid "Updated user group %s" msgstr "更新使用者群組 %s" -#: rhodecode/controllers/admin/users_groups.py:186 +#: rhodecode/controllers/admin/users_groups.py:188 #, python-format -msgid "error occurred during update of users group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:203 -msgid "successfully deleted users group" +msgid "Error occurred during update of user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:205 +#, fuzzy +msgid "Successfully deleted user group" msgstr "成功移除使用者群組" -#: rhodecode/controllers/admin/users_groups.py:208 -msgid "An error occurred during deletion of users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:257 -msgid "Granted 'repository create' permission to users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:262 -msgid "Revoked 'repository create' permission to users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:268 -msgid "Granted 'repository fork' permission to users group" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:273 -msgid "Revoked 'repository fork' permission to users group" -msgstr "" - -#: rhodecode/lib/auth.py:509 +#: rhodecode/controllers/admin/users_groups.py:210 +msgid "An error occurred during deletion of user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:259 +#, fuzzy +msgid "Granted 'repository create' permission to user group" +msgstr "版本庫權限" + +#: rhodecode/controllers/admin/users_groups.py:264 +#, fuzzy +msgid "Revoked 'repository create' permission to user group" +msgstr "版本庫權限" + +#: rhodecode/controllers/admin/users_groups.py:270 +#, fuzzy +msgid "Granted 'repository fork' permission to user group" +msgstr "版本庫權限" + +#: rhodecode/controllers/admin/users_groups.py:275 +#, fuzzy +msgid "Revoked 'repository fork' permission to user group" +msgstr "版本庫權限" + +#: rhodecode/lib/auth.py:530 #, fuzzy, python-format msgid "IP %s not allowed" msgstr "追蹤者" -#: rhodecode/lib/auth.py:558 +#: rhodecode/lib/auth.py:579 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: rhodecode/lib/auth.py:599 +#: rhodecode/lib/auth.py:620 msgid "You need to be a signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: rhodecode/lib/diffs.py:74 -msgid "binary file" +#: rhodecode/lib/diffs.py:66 +#, fuzzy +msgid "Binary file" msgstr "二進位檔" -#: rhodecode/lib/diffs.py:90 +#: rhodecode/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:100 +#: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "尚未有任何變更" -#: rhodecode/lib/helpers.py:374 +#: rhodecode/lib/helpers.py:394 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:506 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:509 msgid "False" msgstr "假" -#: rhodecode/lib/helpers.py:530 +#: rhodecode/lib/helpers.py:547 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "刪除版本庫 %s" -#: rhodecode/lib/helpers.py:533 +#: rhodecode/lib/helpers.py:550 #, fuzzy, python-format msgid "Created tag: %s" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:563 #, fuzzy msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:621 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:641 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:642 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:667 #, fuzzy, python-format msgid "fork name %s" msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:658 -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/lib/helpers.py:684 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:690 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 +#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:694 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 +#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 +#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:674 +#: rhodecode/lib/helpers.py:700 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:682 +#: rhodecode/lib/helpers.py:708 #, fuzzy msgid "[created] user" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:710 #, fuzzy msgid "[updated] user" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:686 -#, fuzzy -msgid "[created] users group" +#: rhodecode/lib/helpers.py:712 +#, fuzzy +msgid "[created] user group" msgstr "建立使用者群組 %s" -#: rhodecode/lib/helpers.py:688 -#, fuzzy -msgid "[updated] users group" +#: rhodecode/lib/helpers.py:714 +#, fuzzy +msgid "[updated] user group" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:716 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:692 +#: rhodecode/lib/helpers.py:718 #, fuzzy msgid "[commented] on pull request for" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:720 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:696 +#: rhodecode/lib/helpers.py:722 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:698 +#: rhodecode/lib/helpers.py:724 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:726 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:728 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:730 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:732 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:884 +#: rhodecode/lib/helpers.py:910 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:888 +#: rhodecode/lib/helpers.py:914 msgid "No Files" msgstr "沒有檔案" -#: rhodecode/lib/helpers.py:1164 +#: rhodecode/lib/helpers.py:1198 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -949,195 +1015,239 @@ "repositories" msgstr "" -#: rhodecode/lib/utils2.py:403 +#: rhodecode/lib/unionrepo.py:193 +#, fuzzy +msgid "cannot create new union repository" +msgstr "建立版本庫 %s" + +#: rhodecode/lib/utils2.py:411 #, fuzzy, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "年" -#: rhodecode/lib/utils2.py:404 +#: rhodecode/lib/utils2.py:412 #, fuzzy, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "月" -#: rhodecode/lib/utils2.py:405 +#: rhodecode/lib/utils2.py:413 #, fuzzy, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "日" -#: rhodecode/lib/utils2.py:406 +#: rhodecode/lib/utils2.py:414 #, fuzzy, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "時" -#: rhodecode/lib/utils2.py:407 +#: rhodecode/lib/utils2.py:415 #, fuzzy, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "分" -#: rhodecode/lib/utils2.py:408 +#: rhodecode/lib/utils2.py:416 #, fuzzy, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "秒" -#: rhodecode/lib/utils2.py:424 +#: rhodecode/lib/utils2.py:432 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:426 +#: rhodecode/lib/utils2.py:434 #, fuzzy, python-format msgid "%s ago" msgstr "之前" -#: rhodecode/lib/utils2.py:428 +#: rhodecode/lib/utils2.py:436 #, fuzzy, python-format msgid "in %s and %s" msgstr "下載 %s 為 %s" -#: rhodecode/lib/utils2.py:431 +#: rhodecode/lib/utils2.py:439 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:442 msgid "just now" msgstr "現在" -#: rhodecode/lib/celerylib/tasks.py:270 -#, fuzzy -msgid "password reset link" -msgstr "您的密碼重設連結已寄出" - #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 #, fuzzy msgid "Repository no access" msgstr "個版本庫" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 #, fuzzy msgid "Repository read access" msgstr "這個版本庫已經存在" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 #, fuzzy msgid "Repository write access" msgstr "個版本庫" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 #, fuzzy msgid "Repository admin access" msgstr "個版本庫" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 #, fuzzy msgid "Repositories Group no access" msgstr "版本庫群組" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 #, fuzzy msgid "Repositories Group read access" msgstr "版本庫群組" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 #, fuzzy msgid "Repositories Group write access" msgstr "版本庫群組" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 #, fuzzy msgid "Repositories Group admin access" msgstr "版本庫群組" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 #, fuzzy msgid "RhodeCode Administrator" msgstr "使用者管理員" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 #, fuzzy msgid "Repository creation disabled" msgstr "版本庫建立" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 #, fuzzy msgid "Repository creation enabled" msgstr "版本庫建立" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 #, fuzzy msgid "Repository forking disabled" msgstr "版本庫建立" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 #, fuzzy msgid "Repository forking enabled" msgstr "版本庫建立" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 #, fuzzy msgid "Register disabled" msgstr "停用" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 msgid "Not Reviewed" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 #, fuzzy msgid "Approved" msgstr "移除" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 msgid "Rejected" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 msgid "Under Review" msgstr "" -#: rhodecode/model/comment.py:109 +#: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:176 +#: rhodecode/model/comment.py:219 msgid "[Mention]" msgstr "" +#: rhodecode/model/db.py:1252 +msgid "top level" +msgstr "" + +#: rhodecode/model/db.py:1393 +#, fuzzy +msgid "Repository group no access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1394 +#, fuzzy +msgid "Repository group read access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1395 +#, fuzzy +msgid "Repository group write access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1396 +#, fuzzy +msgid "Repository group admin access" +msgstr "版本庫群組" + #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "請登入" @@ -1156,223 +1266,249 @@ msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:220 -#, python-format -msgid "commented on commit at %(when)s" -msgstr "" - -#: rhodecode/model/notification.py:221 -#, fuzzy, python-format -msgid "sent message at %(when)s" -msgstr "遞交資訊" - -#: rhodecode/model/notification.py:222 -#, python-format -msgid "mentioned you at %(when)s" -msgstr "" - -#: rhodecode/model/notification.py:223 -#, fuzzy, python-format -msgid "registered in RhodeCode at %(when)s" -msgstr "您已經成功註冊rhodecode" - #: rhodecode/model/notification.py:224 #, fuzzy, python-format -msgid "opened new pull request at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "建立使用者 %s" #: rhodecode/model/notification.py:225 #, fuzzy, python-format -msgid "commented on pull request at %(when)s" -msgstr "建立使用者 %s" - -#: rhodecode/model/pull_request.py:100 +msgid "%(user)s sent message at %(when)s" +msgstr "遞交資訊" + +#: rhodecode/model/notification.py:226 #, python-format -msgid "%(user)s wants you to review pull request #%(pr_id)s" -msgstr "" - -#: rhodecode/model/scm.py:556 +msgid "%(user)s mentioned you at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:227 +#, fuzzy, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "您已經成功註冊rhodecode" + +#: rhodecode/model/notification.py:228 +#, fuzzy, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "建立使用者 %s" + +#: rhodecode/model/notification.py:229 +#, fuzzy, python-format +msgid "%(user)s commented on pull request at %(when)s" +msgstr "建立使用者 %s" + +#: rhodecode/model/pull_request.py:104 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" +msgstr "" + +#: rhodecode/model/scm.py:598 #, fuzzy msgid "latest tip" msgstr "最後登入" -#: rhodecode/model/user.py:231 -#, fuzzy -msgid "new user registration" +#: rhodecode/model/user.py:232 +#, fuzzy +msgid "New user registration" msgstr "[RhodeCode] 新使用者註冊" -#: rhodecode/model/user.py:256 rhodecode/model/user.py:280 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:302 +#: rhodecode/model/user.py:303 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:308 +#: rhodecode/model/user.py:309 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "這個使用者擁有 %s 個版本庫所以無法移除，請先變更版本庫擁有者或者刪除版本庫" -#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38 +#: rhodecode/model/user.py:334 +#, fuzzy +msgid "Password reset link" +msgstr "您的密碼重設連結已寄出" + +#: rhodecode/model/user.py:366 +#, fuzzy +msgid "Your new password" +msgstr "新密碼" + +#: rhodecode/model/user.py:367 +#, python-format +msgid "Your new RhodeCode password:%s" +msgstr "" + +#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:88 +#: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:116 +#: rhodecode/model/validators.py:117 #, fuzzy, python-format msgid "Username %(username)s is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:135 -#, fuzzy -msgid "Invalid users group name" +#: rhodecode/model/validators.py:136 +#, fuzzy +msgid "Invalid user group name" msgstr "無效的使用者名稱" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 #, fuzzy, python-format -msgid "Users group \"%(usersgroup)s\" already exists" +msgid "User group \"%(usergroup)s\" already exists" msgstr "這個使用者群組已存在" -#: rhodecode/model/validators.py:138 +#: rhodecode/model/validators.py:139 +#, fuzzy msgid "" -"users group name may only contain alphanumeric characters underscores, " +"user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "群組名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:176 +#: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, fuzzy, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:179 +#: rhodecode/model/validators.py:180 #, fuzzy, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:238 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "無效的字元在密碼中" -#: rhodecode/model/validators.py:252 +#: rhodecode/model/validators.py:253 msgid "Passwords do not match" msgstr "密碼不相符" -#: rhodecode/model/validators.py:269 -msgid "invalid password" -msgstr "無效的密碼" - #: rhodecode/model/validators.py:270 -msgid "invalid user name" -msgstr "無效的使用者名稱" +msgid "invalid password" +msgstr "無效的密碼" #: rhodecode/model/validators.py:271 +msgid "invalid user name" +msgstr "無效的使用者名稱" + +#: rhodecode/model/validators.py:272 msgid "Your account is disabled" msgstr "您的帳號已被停用" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, fuzzy, python-format msgid "Repository name %(repo)s is disallowed" msgstr "不允許的版本庫名稱" -#: rhodecode/model/validators.py:317 -#, fuzzy, python-format -msgid "Repository named %(repo)s already exists" -msgstr "這個版本庫已經存在" - #: rhodecode/model/validators.py:318 #, fuzzy, python-format +msgid "Repository named %(repo)s already exists" +msgstr "這個版本庫已經存在" + +#: rhodecode/model/validators.py:319 +#, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "這個版本庫已存在於群組 \"%s\"" -#: rhodecode/model/validators.py:320 +#: rhodecode/model/validators.py:321 #, fuzzy, python-format -msgid "Repositories group with name \"%(repo)s\" already exists" +msgid "Repository group with name \"%(repo)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:433 +#: rhodecode/model/validators.py:438 msgid "invalid clone url" msgstr "無效的複製URL" -#: rhodecode/model/validators.py:434 +#: rhodecode/model/validators.py:439 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:459 +#: rhodecode/model/validators.py:464 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "Fork 必須使用相同的版本庫類型" -#: rhodecode/model/validators.py:474 +#: rhodecode/model/validators.py:479 #, fuzzy msgid "You don't have permissions to create repository in this group" msgstr "您沒有權限瀏覽這個頁面" -#: rhodecode/model/validators.py:501 +#: rhodecode/model/validators.py:481 +#, fuzzy +msgid "no permission to create repository in root location" +msgstr "您沒有權限瀏覽這個頁面" + +#: rhodecode/model/validators.py:518 #, fuzzy msgid "You don't have permissions to create a group in this location" msgstr "您沒有權限瀏覽這個頁面" -#: rhodecode/model/validators.py:540 -msgid "This username or users group name is not valid" +#: rhodecode/model/validators.py:557 +#, fuzzy +msgid "This username or user group name is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:636 +#: rhodecode/model/validators.py:650 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: rhodecode/model/validators.py:651 +#: rhodecode/model/validators.py:665 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: rhodecode/model/validators.py:671 +#: rhodecode/model/validators.py:685 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "這個郵件位址不存在" -#: rhodecode/model/validators.py:708 +#: rhodecode/model/validators.py:722 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: rhodecode/model/validators.py:727 +#: rhodecode/model/validators.py:735 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:759 +#: rhodecode/model/validators.py:767 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:760 +#: rhodecode/model/validators.py:768 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/templates/index.html:3 +#: rhodecode/model/validators.py:800 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "儀表板" @@ -1381,225 +1517,232 @@ #: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/bookmarks/bookmarks.html:9 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:9 -#: rhodecode/templates/journal/journal.html:49 -#: rhodecode/templates/journal/journal.html:50 -#: rhodecode/templates/tags/tags.html:10 +#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:47 +#: rhodecode/templates/tags/tags.html:9 msgid "quick filter..." msgstr "快速過濾..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:239 msgid "repositories" msgstr "個版本庫" -#: rhodecode/templates/index_base.html:14 -#: rhodecode/templates/index_base.html:17 +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 #: rhodecode/templates/admin/repos/repos.html:21 msgid "Add repository" msgstr "新增版本庫" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/index_base.html:20 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 +#, fuzzy +msgid "Add group" +msgstr "編輯版本庫群組" + +#: rhodecode/templates/index_base.html:27 #, fuzzy msgid "Edit group" msgstr "編輯版本庫群組" -#: rhodecode/templates/index_base.html:23 +#: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:36 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "Group name" msgstr "群組名稱" -#: rhodecode/templates/index_base.html:37 -#: rhodecode/templates/index_base.html:79 +#: rhodecode/templates/index_base.html:41 +#: rhodecode/templates/index_base.html:83 #: rhodecode/templates/index_base.html:142 #: rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:270 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:73 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/forks/fork.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "描述" -#: rhodecode/templates/index_base.html:47 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 -msgid "Repositories group" +#: rhodecode/templates/index_base.html:51 +#: rhodecode/templates/admin/permissions/permissions.html:55 +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 +#: rhodecode/templates/forks/fork.html:47 +msgid "Repository group" msgstr "版本庫群組" -#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:82 #: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:271 -#: rhodecode/templates/admin/permissions/permissions.html:117 +#: rhodecode/templates/index_base.html:268 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:71 -#: rhodecode/templates/admin/users/user_edit.html:200 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:211 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 -#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/admin/users/user_edit_my_account.html:172 +#: rhodecode/templates/base/perms_summary.html:14 +#: rhodecode/templates/bookmarks/bookmarks.html:34 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:201 -#: rhodecode/templates/journal/journal.html:305 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:132 -#: rhodecode/templates/tags/tags.html:51 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/summary/summary.html:55 +#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/tags/tags.html:48 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名稱" -#: rhodecode/templates/index_base.html:80 +#: rhodecode/templates/index_base.html:84 msgid "Last change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:81 +#: rhodecode/templates/index_base.html:85 #: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:276 +#: rhodecode/templates/index_base.html:273 #: rhodecode/templates/admin/repos/repos.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:213 -#: rhodecode/templates/journal/journal.html:203 -#: rhodecode/templates/journal/journal.html:307 +#: rhodecode/templates/admin/users/user_edit_my_account.html:174 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:298 msgid "Tip" msgstr "" -#: rhodecode/templates/index_base.html:82 +#: rhodecode/templates/index_base.html:86 #: rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:278 +#: rhodecode/templates/index_base.html:275 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "擁有者" -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "" - -#: rhodecode/templates/index_base.html:84 +#: rhodecode/templates/index_base.html:87 msgid "Atom" msgstr "" #: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:296 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:235 +#: rhodecode/templates/admin/users/user_edit_my_account.html:196 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:225 -#: rhodecode/templates/journal/journal.html:329 -#: rhodecode/templates/tags/tags.html:77 +#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/branches/branches.html:73 +#: rhodecode/templates/journal/journal.html:217 +#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "" #: rhodecode/templates/index_base.html:172 -#: rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:301 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:297 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:236 +#: rhodecode/templates/admin/users/user_edit_my_account.html:197 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:226 -#: rhodecode/templates/journal/journal.html:330 -#: rhodecode/templates/tags/tags.html:78 +#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/branches/branches.html:74 +#: rhodecode/templates/journal/journal.html:218 +#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "" #: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:274 +#: rhodecode/templates/index_base.html:271 #, fuzzy msgid "Last Change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:302 +#: rhodecode/templates/index_base.html:211 #: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:237 +#: rhodecode/templates/admin/users/user_edit_my_account.html:198 #: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:227 -#: rhodecode/templates/journal/journal.html:331 -#: rhodecode/templates/tags/tags.html:79 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:219 +#: rhodecode/templates/journal/journal.html:322 +#: rhodecode/templates/tags/tags.html:76 msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:214 -#: rhodecode/templates/index_base.html:303 +#: rhodecode/templates/index_base.html:212 +#: rhodecode/templates/index_base.html:299 #: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:238 +#: rhodecode/templates/admin/users/user_edit_my_account.html:199 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:228 -#: rhodecode/templates/journal/journal.html:332 -#: rhodecode/templates/tags/tags.html:80 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:220 +#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:215 -#: rhodecode/templates/index_base.html:304 +#: rhodecode/templates/index_base.html:213 +#: rhodecode/templates/index_base.html:300 #: rhodecode/templates/admin/repos/repos.html:101 -#: rhodecode/templates/admin/users/user_edit_my_account.html:105 -#: rhodecode/templates/admin/users/user_edit_my_account.html:239 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +#: rhodecode/templates/admin/users/user_edit_my_account.html:200 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:229 -#: rhodecode/templates/journal/journal.html:333 -#: rhodecode/templates/tags/tags.html:81 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:221 +#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/tags/tags.html:78 #, fuzzy msgid "Loading..." msgstr "載入中..." -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 -msgid "Sign In" +#: rhodecode/templates/index_base.html:298 +#, fuzzy +msgid "No repositories found." +msgstr "版本庫群組" + +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +#, fuzzy +msgid "Log In" msgstr "登入" #: rhodecode/templates/login.html:21 -msgid "Sign In to" -msgstr "登入" +#, python-format +msgid "Log In to %s" +msgstr "" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:54 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:89 -#: rhodecode/templates/summary/summary.html:131 +#: rhodecode/templates/admin/users/user_edit.html:57 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 +#: rhodecode/templates/admin/users/users.html:77 +#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "帳號" #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:98 +#: rhodecode/templates/base/base.html:212 msgid "Password" msgstr "密碼" @@ -1608,17 +1751,22 @@ msgid "Remember me" msgstr "成員" +#: rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "登入" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "忘記您的密碼?" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 msgid "Don't have an account ?" msgstr "沒有帳號?" #: rhodecode/templates/password_reset.html:5 -msgid "Reset your password" -msgstr "重設您的密碼" +#, fuzzy +msgid "Password Reset" +msgstr "您的密碼重設連結已寄出" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1650,23 +1798,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57 +#: rhodecode/templates/admin/users/user_edit.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "First Name" msgstr "名" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:103 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66 +#: rhodecode/templates/admin/users/user_edit.html:106 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 msgid "Last Name" msgstr "姓" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75 -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/admin/users/user_edit.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/summary/summary.html:125 msgid "Email" msgstr "電子郵件" @@ -1678,44 +1826,31 @@ msgid "Your account must wait for activation by administrator" msgstr "您的帳號註冊後將等待管理員啟用" -#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:76 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/summary/summary.html:77 msgid "Private repository" msgstr "私有的版本庫" -#: rhodecode/templates/repo_switcher_list.html:16 +#: rhodecode/templates/repo_switcher_list.html:12 +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/summary/summary.html:79 msgid "Public repository" msgstr "公開的版本庫" -#: rhodecode/templates/switch_to_list.html:3 -#: rhodecode/templates/branches/branches.html:14 -msgid "branches" -msgstr "分支" - #: rhodecode/templates/switch_to_list.html:10 #: rhodecode/templates/branches/branches_data.html:57 msgid "There are no branches yet" msgstr "沒有任何分支" -#: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:15 -msgid "tags" -msgstr "標籤" - #: rhodecode/templates/switch_to_list.html:22 #: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "沒有任何標籤" -#: rhodecode/templates/switch_to_list.html:28 -#: rhodecode/templates/bookmarks/bookmarks.html:15 -msgid "bookmarks" -msgstr "" - #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 #, fuzzy @@ -1724,6 +1859,7 @@ #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/base/base.html:68 msgid "Admin journal" msgstr "管理員日誌" @@ -1747,9 +1883,12 @@ #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account.html:215 -#: rhodecode/templates/journal/journal.html:205 -#: rhodecode/templates/journal/journal.html:309 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:87 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:300 msgid "Action" msgstr "動作" @@ -1759,11 +1898,11 @@ msgstr "版本庫" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/tags/tags.html:52 +#: rhodecode/templates/tags/tags.html:49 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "時間" @@ -1783,6 +1922,7 @@ msgstr "版本庫群組" #: rhodecode/templates/admin/defaults/defaults.html:11 +#: rhodecode/templates/base/base.html:75 #, fuzzy msgid "Defaults" msgstr "刪除" @@ -1796,8 +1936,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 +#: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1825,7 +1964,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 #, fuzzy msgid "Enable locking" msgstr "啟用" @@ -1838,14 +1977,17 @@ #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 #: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:148 +#: rhodecode/templates/admin/repos/repo_edit.html:173 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:137 -#: rhodecode/templates/admin/users/user_edit.html:182 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users/user_edit.html:140 +#: rhodecode/templates/admin/users/user_edit.html:185 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "儲存" @@ -1854,7 +1996,9 @@ msgstr "LDAP管理者" #: rhodecode/templates/admin/ldap/ldap.html:11 -msgid "Ldap" +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:74 +msgid "LDAP" msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:28 @@ -1936,8 +2080,7 @@ msgstr "遞交" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 msgid "Pull requests" msgstr "" @@ -1956,6 +2099,7 @@ msgstr "險是註釋" #: rhodecode/templates/admin/notifications/show_notification.html:9 +#: rhodecode/templates/base/base.html:241 #, fuzzy msgid "Notifications" msgstr "位置" @@ -1965,11 +2109,12 @@ msgstr "權限管理員" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63 -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:165 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/users/user_edit.html:150 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:86 +#: rhodecode/templates/base/base.html:73 msgid "Permissions" msgstr "權限" @@ -1983,30 +2128,22 @@ #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" -"All default permissions on each repository will be reset to choosen " +"All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -msgid "overwrite existing settings" +#, fuzzy +msgid "Overwrite existing settings" msgstr "複寫已存在設定" -#: rhodecode/templates/admin/permissions/permissions.html:55 -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" -msgstr "版本庫群組" - #: rhodecode/templates/admin/permissions/permissions.html:62 msgid "" -"All default permissions on each repository group will be reset to choosen" -" permission, note that all custom default permission on repositories " -"group will be lost" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 @@ -2023,22 +2160,23 @@ msgstr "版本庫建立" #: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:209 -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:179 -#: rhodecode/templates/admin/settings/settings.html:269 -#: rhodecode/templates/admin/users/user_edit.html:138 -#: rhodecode/templates/admin/users/user_edit.html:183 -#: rhodecode/templates/admin/users/user_edit.html:286 -#: rhodecode/templates/admin/users/user_edit.html:334 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84 +#: rhodecode/templates/admin/permissions/permissions.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:149 +#: rhodecode/templates/admin/repos/repo_edit.html:174 +#: rhodecode/templates/admin/repos/repo_edit.html:388 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:278 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users/user_edit.html:283 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:95 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:110 msgid "Reset" msgstr "重設" @@ -2047,110 +2185,74 @@ msgid "Default User Permissions" msgstr "預設權限" -#: rhodecode/templates/admin/permissions/permissions.html:111 -#: rhodecode/templates/admin/users/user_edit.html:194 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -#, fuzzy -msgid "Nothing here yet" -msgstr "尚未有任何變更" - -#: rhodecode/templates/admin/permissions/permissions.html:118 -#: rhodecode/templates/admin/users/user_edit.html:201 -#: rhodecode/templates/admin/users/user_edit_my_account.html:61 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 -#, fuzzy -msgid "Permission" -msgstr "權限" - -#: rhodecode/templates/admin/permissions/permissions.html:119 -#: rhodecode/templates/admin/users/user_edit.html:202 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 -#, fuzzy -msgid "Edit Permission" -msgstr "版本庫權限" - -#: rhodecode/templates/admin/permissions/permissions.html:149 -#: rhodecode/templates/admin/permissions/permissions.html:151 -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:232 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:116 -#: rhodecode/templates/data_table/_dt_elements.html:117 -msgid "edit" -msgstr "編輯" - -#: rhodecode/templates/admin/permissions/permissions.html:168 -#: rhodecode/templates/admin/users/user_edit.html:295 +#: rhodecode/templates/admin/permissions/permissions.html:113 +#: rhodecode/templates/admin/users/user_edit.html:244 #, fuzzy msgid "Allowed IP addresses" msgstr "郵件位址" -#: rhodecode/templates/admin/permissions/permissions.html:182 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 -#: rhodecode/templates/admin/users/user_edit.html:263 -#: rhodecode/templates/admin/users/user_edit.html:308 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/admin/permissions/permissions.html:127 +#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 +#: rhodecode/templates/admin/users/user_edit.html:212 +#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users_groups/users_groups.html:46 #: rhodecode/templates/data_table/_dt_elements.html:122 #: rhodecode/templates/data_table/_dt_elements.html:130 msgid "delete" msgstr "刪除" -#: rhodecode/templates/admin/permissions/permissions.html:183 -#: rhodecode/templates/admin/users/user_edit.html:309 +#: rhodecode/templates/admin/permissions/permissions.html:128 +#: rhodecode/templates/admin/users/user_edit.html:258 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "確認刪除這個使用者" -#: rhodecode/templates/admin/permissions/permissions.html:189 -#: rhodecode/templates/admin/users/user_edit.html:315 +#: rhodecode/templates/admin/permissions/permissions.html:134 +#: rhodecode/templates/admin/users/user_edit.html:264 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:200 -#: rhodecode/templates/admin/users/user_edit.html:326 +#: rhodecode/templates/admin/permissions/permissions.html:145 +#: rhodecode/templates/admin/users/user_edit.html:275 #, fuzzy msgid "New ip address" msgstr "郵件位址" -#: rhodecode/templates/admin/permissions/permissions.html:208 -#: rhodecode/templates/admin/users/user_edit.html:285 -#: rhodecode/templates/admin/users/user_edit.html:333 +#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:387 +#: rhodecode/templates/admin/users/user_edit.html:234 +#: rhodecode/templates/admin/users/user_edit.html:282 #, fuzzy msgid "Add" msgstr "新增" -#: rhodecode/templates/admin/repos/repo_add.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -#: rhodecode/templates/base/base.html:154 +#: rhodecode/templates/admin/repos/repo_add.html:12 +#: rhodecode/templates/admin/repos/repo_add.html:16 +#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 +#: rhodecode/templates/base/base.html:263 msgid "Repositories" msgstr "版本庫" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +#: rhodecode/templates/admin/repos/repo_add.html:19 +#, fuzzy +msgid "Add new" msgstr "新增" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:104 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Clone from" msgstr "複製由" #: rhodecode/templates/admin/repos/repo_add_base.html:24 #: rhodecode/templates/admin/repos/repo_edit.html:44 -#: rhodecode/templates/settings/repo_settings.html:43 msgid "Optional http[s] url from which repository should be cloned." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/forks/fork.html:54 +#: rhodecode/templates/forks/fork.html:51 msgid "Optionaly select a group to put this repository into." msgstr "" @@ -2161,45 +2263,40 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 -#: rhodecode/templates/forks/fork.html:41 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/forks/fork.html:38 #, fuzzy msgid "Landing revision" msgstr "下一個修訂" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 -#: rhodecode/templates/forks/fork.html:45 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 -#: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:70 +#: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -msgid "add" -msgstr "新增" - -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 -msgid "add new repository" -msgstr "新增版本庫" - -#: rhodecode/templates/admin/repos/repo_edit.html:5 +#: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" msgstr "編輯版本庫" +#: rhodecode/templates/admin/repos/repo_edit.html:12 +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:11 +#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/summary/summary.html:212 +msgid "Settings" +msgstr "設定" + #: rhodecode/templates/admin/repos/repo_edit.html:40 -#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "複製URL" #: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 msgid "Optional select a group to put this repository into." msgstr "" @@ -2208,166 +2305,211 @@ msgid "Change owner of this repository." msgstr "修改於版本庫 %s" -#: rhodecode/templates/admin/repos/repo_edit.html:152 -msgid "Administration" -msgstr "管理者" - -#: rhodecode/templates/admin/repos/repo_edit.html:155 +#: rhodecode/templates/admin/repos/repo_edit.html:184 +#, fuzzy +msgid "Advanced settings" +msgstr "儲存設定" + +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Statistics" msgstr "統計" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Reset current statistics" msgstr "重設目前的統計" -#: rhodecode/templates/admin/repos/repo_edit.html:159 +#: rhodecode/templates/admin/repos/repo_edit.html:191 msgid "Confirm to remove current statistics" msgstr "確認移除目前的統計" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:195 msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:171 -msgid "Remote" -msgstr "遠端" - -#: rhodecode/templates/admin/repos/repo_edit.html:175 -msgid "Pull changes from remote location" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:175 -msgid "Confirm to pull changes from remote side" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:186 -msgid "Cache" -msgstr "快取" - -#: rhodecode/templates/admin/repos/repo_edit.html:190 -msgid "Invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:190 -msgid "Confirm to invalidate repository cache" -msgstr "確認廢止版本庫快取" - -#: rhodecode/templates/admin/repos/repo_edit.html:193 -msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:198 -msgid "List of cached values" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Prefix" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:202 -msgid "Key" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:203 -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:121 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" -msgstr "啟用" +msgid "Remote" +msgstr "遠端" + +#: rhodecode/templates/admin/repos/repo_edit.html:207 +msgid "Pull changes from remote location" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:207 +msgid "Confirm to pull changes from remote side" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:306 -#: rhodecode/templates/base/base.html:308 -#: rhodecode/templates/base/base.html:310 +msgid "Cache" +msgstr "快取" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Confirm to invalidate repository cache" +msgstr "確認廢止版本庫快取" + +#: rhodecode/templates/admin/repos/repo_edit.html:225 +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:230 +msgid "List of cached values" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:233 +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:234 +msgid "Key" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:124 +#: rhodecode/templates/admin/users/users.html:84 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +#: rhodecode/templates/admin/users_groups/users_groups.html:36 +msgid "Active" +msgstr "啟用" + +#: rhodecode/templates/admin/repos/repo_edit.html:250 +#: rhodecode/templates/base/base.html:280 +#: rhodecode/templates/base/base.html:281 msgid "Public journal" msgstr "公開日誌" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "Remove from public journal" msgstr "從公開日誌移除" -#: rhodecode/templates/admin/repos/repo_edit.html:226 +#: rhodecode/templates/admin/repos/repo_edit.html:258 msgid "Add to public journal" msgstr "新增至公開日誌" -#: rhodecode/templates/admin/repos/repo_edit.html:231 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:238 +#: rhodecode/templates/admin/repos/repo_edit.html:270 #, fuzzy msgid "Locking" msgstr "解鎖" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:275 #, fuzzy msgid "Confirm to unlock repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:246 +#: rhodecode/templates/admin/repos/repo_edit.html:278 #, fuzzy msgid "Confirm to lock repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:247 +#: rhodecode/templates/admin/repos/repo_edit.html:279 #, fuzzy msgid "Repository is not locked" msgstr "個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:252 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:291 msgid "Set as fork of" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:264 +#: rhodecode/templates/admin/repos/repo_edit.html:296 msgid "set" msgstr "設定" -#: rhodecode/templates/admin/repos/repo_edit.html:268 +#: rhodecode/templates/admin/repos/repo_edit.html:300 msgid "Manually set this repository as a fork of another from the list" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:274 +#: rhodecode/templates/admin/repos/repo_edit.html:306 #: rhodecode/templates/changeset/changeset_file_comment.html:41 msgid "Delete" msgstr "移除" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Remove this repository" msgstr "移除版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#: rhodecode/templates/settings/repo_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:282 -#: rhodecode/templates/settings/repo_settings.html:119 +#: rhodecode/templates/admin/repos/repo_edit.html:317 +#, fuzzy, python-format +msgid "this repository has %s fork" +msgid_plural "this repository has %s forks" +msgstr[0] "建立版本庫 %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:318 +msgid "Detach forks" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:319 +#, fuzzy +msgid "Delete forks" +msgstr "刪除" + +#: rhodecode/templates/admin/repos/repo_edit.html:322 msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need fully delete it " -"from file system please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" +" from file system please do it manually" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:336 +msgid "Extra fields" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:348 +#, fuzzy, python-format +msgid "Confirm to delete this field: %s" +msgstr "確認刪除這個使用者" + +#: rhodecode/templates/admin/repos/repo_edit.html:362 +#, fuzzy +msgid "New field key" +msgstr "新增使用者" + +#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgid "New field label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:373 +msgid "Enter short label" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:379 +#, fuzzy +msgid "New field description" +msgstr "描述" + +#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgid "Enter description of a field" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 @@ -2387,8 +2529,6 @@ #: 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:85 -#: rhodecode/templates/base/base.html:235 msgid "admin" msgstr "管理員" @@ -2398,75 +2538,60 @@ msgstr "成員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 -#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "私有版本庫" #: rhodecode/templates/admin/repos/repo_edit_perms.html:19 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 #, fuzzy msgid "default" msgstr "刪除" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 msgid "revoke" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 msgid "Add another member" msgstr "新增另ㄧ位成員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 msgid "Failed to remove user" msgstr "移除使用者失敗" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 -msgid "Failed to remove users group" +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 +#, fuzzy +msgid "Failed to remove user group" msgstr "移除使用者群組失敗" #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "版本庫管理員" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 msgid "apply to children" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" msgstr "" +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#, python-format +msgid "%s Group Dashboard" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 -#: rhodecode/templates/base/base.html:128 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 msgid "Home" msgstr "首頁" @@ -2475,78 +2600,86 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repos group" -msgstr "新增版本庫群組" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 -msgid "Repos groups" +#, fuzzy +msgid "Add repository group" msgstr "版本庫群組" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 -msgid "add new repos group" +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 +#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 +#, fuzzy +msgid "Repository groups" +msgstr "版本庫群組" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 +#, fuzzy +msgid "Add new repository group" msgstr "新增版本庫群組" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 msgid "Group parent" msgstr "父群組" -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/users/user_add.html:94 -#: rhodecode/templates/admin/users_groups/users_group_add.html:49 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:149 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59 msgid "save" msgstr "儲存" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repos group" +#, fuzzy +msgid "Edit repository group" msgstr "編輯版本庫群組" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 -msgid "edit repos group" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 +#, fuzzy, python-format +msgid "Edit repository group %s" msgstr "編輯版本庫群組" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26 -#, fuzzy -msgid "Add new child group" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 +#, fuzzy +msgid "Add child group" msgstr "新增使用者群組" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repositories groups administration" +#, fuzzy +msgid "Repository groups administration" msgstr "版本庫群組管理員" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -#, fuzzy -msgid "Add new group" -msgstr "新增使用者群組" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 #, fuzzy msgid "Number of toplevel repositories" msgstr "版本庫數量" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "動作" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#, fuzzy +msgid "Edit" +msgstr "編輯" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/base/perms_summary.html:29 +#: rhodecode/templates/base/perms_summary.html:48 +#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/data_table/_dt_elements.html:116 +#: rhodecode/templates/data_table/_dt_elements.html:117 +msgid "edit" +msgstr "編輯" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 #, fuzzy, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "確認移除這個版本庫" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68 -msgid "There are no repositories groups yet" +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 +#, fuzzy +msgid "There are no repository groups yet" msgstr "沒有任何版本庫群組" #: rhodecode/templates/admin/settings/hooks.html:5 @@ -2554,12 +2687,6 @@ msgid "Settings administration" msgstr "設定管理員" -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:13 -msgid "Settings" -msgstr "設定" - #: rhodecode/templates/admin/settings/hooks.html:24 msgid "Built in hooks - read only" msgstr "內建hook - 唯讀" @@ -2576,216 +2703,227 @@ msgid "Failed to remove hook" msgstr "移除hook失敗" -#: rhodecode/templates/admin/settings/settings.html:24 +#: rhodecode/templates/admin/settings/settings.html:26 msgid "Remap and rescan repositories" msgstr "重新對映與掃描版本庫" -#: rhodecode/templates/admin/settings/settings.html:32 -msgid "rescan option" +#: rhodecode/templates/admin/settings/settings.html:34 +#, fuzzy +msgid "Rescan option" msgstr "重新掃描選項" -#: rhodecode/templates/admin/settings/settings.html:38 +#: rhodecode/templates/admin/settings/settings.html:40 msgid "" "In case a repository was deleted from filesystem and there are leftovers " "in the database check this option to scan obsolete data in database and " "remove it." msgstr "如果版本庫已從檔案系統中刪除，但是資料還留在資料庫，請勾選這個項目清理資料庫中舊的資料" -#: rhodecode/templates/admin/settings/settings.html:39 -msgid "destroy old data" +#: rhodecode/templates/admin/settings/settings.html:41 +#, fuzzy +msgid "Destroy old data" msgstr "移除舊資料" -#: rhodecode/templates/admin/settings/settings.html:41 +#: rhodecode/templates/admin/settings/settings.html:43 msgid "" "Rescan repositories location for new repositories. Also deletes obsolete " "if `destroy` flag is checked " msgstr "" -#: rhodecode/templates/admin/settings/settings.html:46 +#: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" msgstr "重新掃描版本庫" -#: rhodecode/templates/admin/settings/settings.html:52 +#: rhodecode/templates/admin/settings/settings.html:54 msgid "Whoosh indexing" msgstr "Whoosh 索引" -#: rhodecode/templates/admin/settings/settings.html:60 -msgid "index build option" +#: rhodecode/templates/admin/settings/settings.html:62 +#, fuzzy +msgid "Index build option" msgstr "索引選項" -#: rhodecode/templates/admin/settings/settings.html:65 -msgid "build from scratch" +#: rhodecode/templates/admin/settings/settings.html:67 +#, fuzzy +msgid "Build from scratch" msgstr "重頭建立索引" -#: rhodecode/templates/admin/settings/settings.html:71 +#: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" msgstr "重新索引" -#: rhodecode/templates/admin/settings/settings.html:77 +#: rhodecode/templates/admin/settings/settings.html:79 msgid "Global application settings" msgstr "全域設定" -#: rhodecode/templates/admin/settings/settings.html:86 -msgid "Application name" -msgstr "應用名稱" - -#: rhodecode/templates/admin/settings/settings.html:95 -msgid "Realm text" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:104 -msgid "GA code" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/settings/settings.html:268 +#: rhodecode/templates/admin/settings/settings.html:88 +msgid "Site branding" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:97 +msgid "HTTP authentication realm" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:106 +msgid "Google Analytics code" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:114 +#: rhodecode/templates/admin/settings/settings.html:186 +#: rhodecode/templates/admin/settings/settings.html:277 msgid "Save settings" msgstr "儲存設定" -#: rhodecode/templates/admin/settings/settings.html:119 +#: rhodecode/templates/admin/settings/settings.html:121 #, fuzzy msgid "Visualisation settings" msgstr "全域設定" -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:129 #, fuzzy msgid "General" msgstr "啟用" -#: rhodecode/templates/admin/settings/settings.html:132 +#: rhodecode/templates/admin/settings/settings.html:134 msgid "Use lightweight dashboard" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:140 +#, fuzzy +msgid "Use repository extra fields" +msgstr "個版本庫" + +#: rhodecode/templates/admin/settings/settings.html:147 #, fuzzy msgid "Icons" msgstr "選項" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:156 #, fuzzy msgid "Show private repo icon on repositories" msgstr "私有版本庫" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:163 #, fuzzy msgid "Meta-Tagging" msgstr "設定" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:168 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:187 +#: rhodecode/templates/admin/settings/settings.html:195 #, fuzzy msgid "VCS settings" msgstr "設定" -#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:201 -#, fuzzy -msgid "require ssl for vcs operations" -msgstr "推送時要求使用SSL" - -#: rhodecode/templates/admin/settings/settings.html:203 -msgid "" -"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " -"will return HTTP Error 406: Not Acceptable" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:209 +#, fuzzy +msgid "Require SSL for vcs operations" +msgstr "推送時要求使用SSL" + +#: rhodecode/templates/admin/settings/settings.html:211 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:217 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:214 -msgid "Update repository after push (hg update)" -msgstr "push後更新版本庫 (hg update)" - -#: rhodecode/templates/admin/settings/settings.html:218 -msgid "Show repository size after push" -msgstr "push 後顯示版本庫大小" - #: rhodecode/templates/admin/settings/settings.html:222 +msgid "Update repository after push (hg update)" +msgstr "push後更新版本庫 (hg update)" + +#: rhodecode/templates/admin/settings/settings.html:226 +msgid "Show repository size after push" +msgstr "push 後顯示版本庫大小" + +#: rhodecode/templates/admin/settings/settings.html:230 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: rhodecode/templates/admin/settings/settings.html:226 +#: rhodecode/templates/admin/settings/settings.html:234 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: rhodecode/templates/admin/settings/settings.html:230 -msgid "advanced setup" +#: rhodecode/templates/admin/settings/settings.html:238 +#, fuzzy +msgid "Advanced setup" msgstr "進階設定" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:243 #, fuzzy msgid "Mercurial Extensions" msgstr "Mercurial 版本庫" -#: rhodecode/templates/admin/settings/settings.html:240 -msgid "largefiles extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:244 -msgid "hgsubversion extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:246 +#: rhodecode/templates/admin/settings/settings.html:248 +msgid "Enable largefiles extension" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:252 +msgid "Enable hgsubversion extension" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:254 msgid "" -"Requires hgsubversion library installed. Allows clonning from svn remote " +"Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:256 +#: rhodecode/templates/admin/settings/settings.html:264 msgid "Repositories location" msgstr "版本庫路徑" -#: rhodecode/templates/admin/settings/settings.html:261 +#: rhodecode/templates/admin/settings/settings.html:269 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "這是一個關鍵的設定，如果您確定要修改這個設定，請重新啟動應用程式以套用設定" -#: rhodecode/templates/admin/settings/settings.html:262 -#: rhodecode/templates/base/base.html:227 -msgid "unlock" +#: rhodecode/templates/admin/settings/settings.html:270 +#: rhodecode/templates/base/base.html:131 +#, fuzzy +msgid "Unlock" msgstr "解鎖" -#: rhodecode/templates/admin/settings/settings.html:263 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:283 +#: rhodecode/templates/admin/settings/settings.html:292 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:291 +#: rhodecode/templates/admin/settings/settings.html:300 #, fuzzy msgid "Email to" msgstr "電子郵件" -#: rhodecode/templates/admin/settings/settings.html:299 +#: rhodecode/templates/admin/settings/settings.html:308 #, fuzzy msgid "Send" msgstr "秒" -#: rhodecode/templates/admin/settings/settings.html:305 +#: rhodecode/templates/admin/settings/settings.html:314 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:308 -#, fuzzy -msgid "show" +#: rhodecode/templates/admin/settings/settings.html:317 +#: rhodecode/templates/changelog/changelog.html:42 +msgid "Show" msgstr "顯示" #: rhodecode/templates/admin/users/user_add.html:5 @@ -2794,11 +2932,14 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 +#: rhodecode/templates/base/base.html:71 msgid "Users" msgstr "使用者" #: rhodecode/templates/admin/users/user_add.html:12 -msgid "add new user" +#: rhodecode/templates/admin/users/users.html:23 +#, fuzzy +msgid "Add new user" msgstr "新增使用者" #: rhodecode/templates/admin/users/user_add.html:50 @@ -2810,6 +2951,12 @@ msgid "Edit user" msgstr "編輯使用者" +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#, fuzzy, python-format +msgid "Edit %s" +msgstr "編輯" + #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 msgid "Change your avatar at" @@ -2825,31 +2972,32 @@ msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:48 -msgid "Your IP" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit.html:67 +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 +msgid "Current IP" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:76 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39 +#: rhodecode/templates/admin/users/user_edit.html:79 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password" msgstr "新密碼" -#: rhodecode/templates/admin/users/user_edit.html:85 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48 +#: rhodecode/templates/admin/users/user_edit.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "New password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:158 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 #, fuzzy msgid "Inherit default permissions" msgstr "預設權限" -#: rhodecode/templates/admin/users/user_edit.html:160 +#: rhodecode/templates/admin/users/user_edit.html:163 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2857,34 +3005,34 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:169 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "建立版本庫" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:177 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 #, fuzzy msgid "Fork repositories" msgstr "個版本庫" -#: rhodecode/templates/admin/users/user_edit.html:251 +#: rhodecode/templates/admin/users/user_edit.html:200 #, fuzzy msgid "Email addresses" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/users/user_edit.html:213 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "確認刪除這個使用者" -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/users/user_edit.html:227 #, fuzzy msgid "New email address" msgstr "郵件位址" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:130 +#: rhodecode/templates/base/base.html:242 msgid "My account" msgstr "我的帳號" @@ -2898,7 +3046,7 @@ msgstr "權限" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:57 +#: rhodecode/templates/journal/journal.html:54 #, fuzzy msgid "My repos" msgstr "空的版本庫" @@ -2908,32 +3056,46 @@ msgid "My pull requests" msgstr "建立使用者 %s" -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/journal/journal.html:61 -#, fuzzy -msgid "Add repo" -msgstr "新增" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 +#, fuzzy +msgid "Show closed pull requests" +msgstr "建立使用者 %s" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 +#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_show.html:27 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +msgid "Closed" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 #, fuzzy msgid "Confirm to delete this pull request" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 +#, fuzzy +msgid "Nothing here yet" +msgstr "尚未有任何變更" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "" @@ -2943,69 +3105,60 @@ msgstr "使用者管理員" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:241 msgid "users" msgstr "使用者" -#: rhodecode/templates/admin/users/users.html:23 -#, fuzzy -msgid "Add new user" -msgstr "新增使用者" - -#: rhodecode/templates/admin/users/users.html:77 -msgid "username" -msgstr "使用者名稱" - #: rhodecode/templates/admin/users/users.html:80 #, fuzzy -msgid "firstname" +msgid "Firstname" msgstr "名" #: rhodecode/templates/admin/users/users.html:81 -msgid "lastname" +#, fuzzy +msgid "Lastname" msgstr "姓" #: rhodecode/templates/admin/users/users.html:82 -msgid "last login" +#, fuzzy +msgid "Last login" msgstr "最後登入" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" -msgstr "啟用" - -#: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:244 -msgid "ldap" -msgstr "" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -msgid "Add users group" +#, fuzzy +msgid "Add user group" msgstr "新增使用者群組" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -msgid "Users groups" +#: rhodecode/templates/admin/users_groups/users_groups.html:11 +#: rhodecode/templates/base/base.html:72 +#, fuzzy +msgid "User groups" msgstr "使用者群組" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -msgid "add new users group" +#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#, fuzzy +msgid "Add new user group" msgstr "新增使用者群組" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit users group" +#, fuzzy +msgid "Edit user group" msgstr "編輯使用者群組" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -msgid "UsersGroups" +#, fuzzy +msgid "UserGroups" msgstr "使用者群組" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "Members" msgstr "成員" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -msgid "Choosen group members" +#, fuzzy +msgid "Chosen group members" msgstr "選擇群組成員" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 @@ -3020,274 +3173,266 @@ msgid "Add all elements" msgstr "新增索有元素" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 #, fuzzy msgid "Group members" msgstr "選擇群組成員" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 #, fuzzy msgid "No members yet" msgstr "成員" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 -#, fuzzy -msgid "Permissions defined for this group" -msgstr "權限管理員" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 -#, fuzzy -msgid "No permissions set yet" -msgstr "權限" - #: rhodecode/templates/admin/users_groups/users_groups.html:5 -msgid "Users groups administration" +#, fuzzy +msgid "User groups administration" msgstr "使用者群組管理員" -#: rhodecode/templates/admin/users_groups/users_groups.html:23 -#, fuzzy -msgid "Add new user group" -msgstr "新增使用者群組" - -#: rhodecode/templates/admin/users_groups/users_groups.html:32 -msgid "group name" -msgstr "群組名稱" - -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -#: rhodecode/templates/base/root.html:46 -msgid "members" -msgstr "成員" - -#: rhodecode/templates/admin/users_groups/users_groups.html:45 +#: rhodecode/templates/admin/users_groups/users_groups.html:47 #, fuzzy, python-format -msgid "Confirm to delete this users group: %s" +msgid "Confirm to delete this user group: %s" msgstr "確認刪除這個群組" -#: rhodecode/templates/base/base.html:41 +#: rhodecode/templates/base/base.html:42 msgid "Submit a bug" msgstr "回報錯誤" -#: rhodecode/templates/base/base.html:76 -#, fuzzy -msgid "Not logged in" -msgstr "最後登入" - -#: rhodecode/templates/base/base.html:83 -msgid "Login to your account" -msgstr "" - -#: rhodecode/templates/base/base.html:106 -msgid "Forgot password ?" -msgstr "忘記密碼?" - -#: rhodecode/templates/base/base.html:113 -#, fuzzy -msgid "Log In" -msgstr "登入" - -#: rhodecode/templates/base/base.html:124 -msgid "Inbox" -msgstr "" - -#: rhodecode/templates/base/base.html:129 -#: rhodecode/templates/base/base.html:297 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:301 -#: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/public_journal.html:4 -msgid "Journal" -msgstr "日誌" - -#: rhodecode/templates/base/base.html:131 -msgid "Log Out" -msgstr "登出" - -#: rhodecode/templates/base/base.html:150 -msgid "Switch repository" -msgstr "切換版本庫" - -#: rhodecode/templates/base/base.html:152 -msgid "Products" -msgstr "" - -#: rhodecode/templates/base/base.html:158 -#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47 -msgid "loading..." -msgstr "載入中..." - -#: rhodecode/templates/base/base.html:166 -#: rhodecode/templates/base/base.html:168 -#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/base/base.html:108 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 +#: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "概況" -#: rhodecode/templates/base/base.html:174 -#: rhodecode/templates/base/base.html:176 -#: rhodecode/templates/base/base.html:178 -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/base/base.html:109 +#: rhodecode/templates/changelog/changelog.html:11 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "修改紀錄" -#: rhodecode/templates/base/base.html:182 -#: rhodecode/templates/base/base.html:184 -#: rhodecode/templates/base/base.html:186 -msgid "Switch to" -msgstr "切換至" - -#: rhodecode/templates/base/base.html:193 -#: rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:110 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:12 msgid "Files" msgstr "檔案" -#: rhodecode/templates/base/base.html:201 -#: rhodecode/templates/base/base.html:205 +#: rhodecode/templates/base/base.html:112 +#, fuzzy +msgid "Switch To" +msgstr "切換至" + +#: rhodecode/templates/base/base.html:114 +#: rhodecode/templates/base/base.html:267 +msgid "loading..." +msgstr "載入中..." + +#: rhodecode/templates/base/base.html:118 msgid "Options" msgstr "選項" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/base/base.html:212 -#, fuzzy -msgid "repository settings" -msgstr "版本庫建立" - -#: rhodecode/templates/base/base.html:216 +#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/base/base.html:126 +msgid "Lightweight changelog" +msgstr "" + +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:54 +msgid "Search" +msgstr "搜尋" + +#: rhodecode/templates/base/base.html:133 +#, fuzzy +msgid "Lock" +msgstr "解鎖" + +#: rhodecode/templates/base/base.html:141 +#, fuzzy +msgid "Follow" +msgstr "追蹤者" + +#: rhodecode/templates/base/base.html:142 +#, fuzzy +msgid "Unfollow" +msgstr "追蹤者" + +#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/forks/fork.html:13 -msgid "fork" -msgstr "" - -#: rhodecode/templates/base/base.html:218 -#: rhodecode/templates/changelog/changelog.html:43 -#, fuzzy -msgid "open new pull request" +#: rhodecode/templates/forks/fork.html:9 +msgid "Fork" +msgstr "分支" + +#: rhodecode/templates/base/base.html:147 +#, fuzzy +msgid "Create Pull Request" msgstr "建立使用者 %s" -#: rhodecode/templates/base/base.html:221 -#, fuzzy -msgid "compare fork" -msgstr "比較顯示" - -#: rhodecode/templates/base/base.html:223 -msgid "search" -msgstr "搜尋" - -#: rhodecode/templates/base/base.html:229 -#, fuzzy -msgid "lock" -msgstr "解鎖" - -#: rhodecode/templates/base/base.html:240 -msgid "repositories groups" -msgstr "版本庫群組" - -#: rhodecode/templates/base/base.html:242 -msgid "users groups" -msgstr "使用者群組" +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Show Pull Requests" +msgstr "建立使用者 %s" + +#: rhodecode/templates/base/base.html:153 +#, fuzzy +msgid "Pull Requests" +msgstr "建立使用者 %s" + +#: rhodecode/templates/base/base.html:190 +#, fuzzy +msgid "Not logged in" +msgstr "最後登入" + +#: rhodecode/templates/base/base.html:197 +msgid "Login to your account" +msgstr "" + +#: rhodecode/templates/base/base.html:220 +msgid "Forgot password ?" +msgstr "忘記密碼?" #: rhodecode/templates/base/base.html:243 -msgid "permissions" +msgid "Log Out" +msgstr "登出" + +#: rhodecode/templates/base/base.html:262 +msgid "Switch repository" +msgstr "切換版本庫" + +#: rhodecode/templates/base/base.html:274 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "日誌" + +#: rhodecode/templates/base/base.html:286 +#, fuzzy +msgid "Search in repositories" +msgstr "於所有的版本庫" + +#: rhodecode/templates/base/perms_summary.html:8 +#, fuzzy +msgid "No permissions defined yet" msgstr "權限" -#: rhodecode/templates/base/base.html:245 -#, fuzzy -msgid "defaults" -msgstr "刪除" - -#: rhodecode/templates/base/base.html:246 -msgid "settings" -msgstr "設定" - -#: rhodecode/templates/base/base.html:256 -#: rhodecode/templates/base/base.html:258 -msgid "Followers" -msgstr "追蹤者" - -#: rhodecode/templates/base/base.html:264 -#: rhodecode/templates/base/base.html:266 -msgid "Forks" -msgstr "" - -#: rhodecode/templates/base/base.html:315 -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 -#: rhodecode/templates/search/search.html:52 -msgid "Search" -msgstr "搜尋" - -#: rhodecode/templates/base/root.html:42 -#, fuzzy -msgid "add another comment" -msgstr "新增另ㄧ位成員" +#: rhodecode/templates/base/perms_summary.html:15 +#, fuzzy +msgid "Permission" +msgstr "權限" + +#: rhodecode/templates/base/perms_summary.html:16 +#, fuzzy +msgid "Edit Permission" +msgstr "版本庫權限" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/data_table/_dt_elements.html:140 -#: rhodecode/templates/summary/summary.html:57 -msgid "Stop following this repository" -msgstr "停止追蹤這個版本庫" +#, fuzzy +msgid "Add another comment" +msgstr "新增另ㄧ位成員" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:140 +msgid "Stop following this repository" +msgstr "停止追蹤這個版本庫" + +#: rhodecode/templates/base/root.html:45 msgid "Start following this repository" msgstr "開始追蹤這個版本庫" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Group" msgstr "群組" +#: rhodecode/templates/base/root.html:47 +msgid "members" +msgstr "成員" + #: rhodecode/templates/base/root.html:48 -msgid "search truncated" -msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.html:181 +#, fuzzy +msgid "Loading ..." +msgstr "載入中..." #: rhodecode/templates/base/root.html:49 -msgid "no matching files" -msgstr "無符合的檔案" +msgid "Search truncated" +msgstr "" #: rhodecode/templates/base/root.html:50 -msgid "Open new pull request" -msgstr "" +#, fuzzy +msgid "No matching files" +msgstr "無符合的檔案" #: rhodecode/templates/base/root.html:51 -msgid "Open new pull request for selected changesets" +#: rhodecode/templates/changelog/changelog.html:36 +msgid "Open new pull request" msgstr "" #: rhodecode/templates/base/root.html:52 -msgid "Show selected changes __S -> __E" +msgid "Open new pull request for selected changesets" msgstr "" #: rhodecode/templates/base/root.html:53 +msgid "Show selected changesets __S -> __E" +msgstr "" + +#: rhodecode/templates/base/root.html:54 +#, fuzzy +msgid "Show selected changeset __S" +msgstr "尚未有任何變更" + +#: rhodecode/templates/base/root.html:55 msgid "Selection link" msgstr "" +#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/changeset/diff_block.html:8 +#, fuzzy +msgid "Collapse diff" +msgstr "檔案差異" + +#: rhodecode/templates/base/root.html:57 +#, fuzzy +msgid "Expand diff" +msgstr "原始差異" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 #, fuzzy msgid "Author" msgstr "作者" -#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks.html:38 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/tags/tags.html:55 +#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "修訂" @@ -3297,16 +3442,14 @@ msgid "%s Branches" msgstr "分支" -#: rhodecode/templates/branches/branches.html:29 +#: rhodecode/templates/branches/branches.html:26 #, fuzzy msgid "Compare branches" msgstr "分支" -#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches.html:53 #: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/compare/compare_diff.html:5 -#: rhodecode/templates/compare/compare_diff.html:13 -#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:10 #, fuzzy msgid "Compare" @@ -3317,185 +3460,182 @@ msgid "%s Changelog" msgstr "修改紀錄" -#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/changelog/changelog.html:11 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" -#: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/changelog/changelog.html:30 #, fuzzy msgid "Clear selection" msgstr "搜尋選項" -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:33 #: rhodecode/templates/forks/forks_data.html:19 -#, python-format -msgid "compare fork with %s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:40 +#, fuzzy, python-format +msgid "Compare fork with %s" +msgstr "比較顯示" + +#: rhodecode/templates/changelog/changelog.html:33 msgid "Compare fork with parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:49 -msgid "Show" -msgstr "顯示" - -#: rhodecode/templates/changelog/changelog.html:74 -#: rhodecode/templates/summary/summary.html:375 -msgid "show more" +#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/summary/summary.html:404 +#, fuzzy +msgid "Show more" msgstr "顯示更多" -#: rhodecode/templates/changelog/changelog.html:78 -msgid "Affected number of files, click to show more details" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:65 -#: rhodecode/templates/changeset/changeset_file_comment.html:20 -#: rhodecode/templates/changeset/changeset_range.html:46 -#, fuzzy -msgid "Changeset status" -msgstr "變更" - -#: rhodecode/templates/changelog/changelog.html:94 -#: rhodecode/templates/shortlog/shortlog_data.html:20 +#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changeset/changeset_range.html:86 #, python-format -msgid "Click to open associated pull request #%s" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:104 -msgid "Parent" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:42 -msgid "No parents" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:115 +msgid "Bookmark %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:95 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset_range.html:92 +#, fuzzy, python-format +msgid "Tag %s" +msgstr "標籤" + +#: rhodecode/templates/changelog/changelog.html:100 #: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:79 -msgid "merge" -msgstr "合併" - -#: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:109 -#: rhodecode/templates/changeset/changeset_range.html:82 -#: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_add.html:33 -#: rhodecode/templates/files/files_edit.html:33 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -msgid "branch" +#: rhodecode/templates/changeset/changeset_range.html:80 +#, fuzzy, python-format +msgid "Branch %s" msgstr "分支" -#: rhodecode/templates/changelog/changelog.html:124 -#: rhodecode/templates/changeset/changeset_range.html:88 -msgid "bookmark" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:114 -#: rhodecode/templates/changeset/changeset_range.html:94 -msgid "tag" -msgstr "標籤" - -#: rhodecode/templates/changelog/changelog.html:302 +#: rhodecode/templates/changelog/changelog.html:258 msgid "There are no changes yet" msgstr "尚未有任何變更" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:94 -msgid "removed" +#: rhodecode/templates/changeset/changeset.html:91 +#, fuzzy +msgid "Removed" msgstr "移除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:95 -msgid "changed" +#: rhodecode/templates/changeset/changeset.html:92 +#, fuzzy +msgid "Changed" msgstr "修改" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:96 -msgid "added" +#: rhodecode/templates/changeset/changeset.html:93 +#, fuzzy +msgid "Added" msgstr "新增" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:98 -#: rhodecode/templates/changeset/changeset.html:99 -#: rhodecode/templates/changeset/changeset.html:100 -#, python-format -msgid "affected %s files" -msgstr "" +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changeset/changeset.html:97 +#, fuzzy, python-format +msgid "Affected %s files" +msgstr "檔案" #: rhodecode/templates/changeset/changeset.html:6 #, fuzzy, python-format msgid "%s Changeset" msgstr "沒有修改" -#: rhodecode/templates/changeset/changeset.html:14 -msgid "Changeset" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:52 +#: rhodecode/templates/changeset/changeset.html:39 +msgid "No parents" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:49 msgid "No children" msgstr "" -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/diff_block.html:20 -msgid "raw diff" +#: rhodecode/templates/changeset/changeset.html:62 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:44 +#, fuzzy +msgid "Changeset status" +msgstr "變更" + +#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/diff_block.html:23 +#, fuzzy +msgid "Raw diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:71 -#, fuzzy -msgid "patch diff" +#: rhodecode/templates/changeset/changeset.html:68 +#, fuzzy +msgid "Patch diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:72 -#: rhodecode/templates/changeset/diff_block.html:21 -msgid "download diff" +#: rhodecode/templates/changeset/changeset.html:69 +#: rhodecode/templates/changeset/diff_block.html:24 +#, fuzzy +msgid "Download diff" msgstr "下載差異" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, fuzzy, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "遞交" -#: rhodecode/templates/changeset/changeset.html:76 +#: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "" -#: rhodecode/templates/changeset/changeset.html:122 -#: rhodecode/templates/compare/compare_diff.html:44 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:77 +msgid "merge" +msgstr "合併" + +#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/compare/compare_diff.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, fuzzy, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "檔案修改" -#: rhodecode/templates/changeset/changeset.html:124 -#: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/pullrequests/pullrequest_show.html:96 +#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/compare/compare_diff.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +msgid "Showing a huge diff might take some time and resources" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:134 +#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:195 +#, fuzzy +msgid "Show full diff" +msgstr "載入檔案列表..." + #: rhodecode/templates/changeset/changeset_file_comment.html:30 #, fuzzy, python-format -msgid "Status from pull request %s" +msgid "Status change on pull request #%s" msgstr "建立使用者 %s" #: rhodecode/templates/changeset/changeset_file_comment.html:32 #, fuzzy, python-format -msgid "Comment from pull request %s" +msgid "Comment on pull request #%s" msgstr "建立使用者 %s" #: rhodecode/templates/changeset/changeset_file_comment.html:57 @@ -3507,26 +3647,26 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:139 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:142 +#: rhodecode/templates/changeset/changeset_file_comment.html:141 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:162 +#: rhodecode/templates/changeset/changeset_file_comment.html:161 #, fuzzy msgid "Comment" msgstr "遞交" #: rhodecode/templates/changeset/changeset_file_comment.html:75 -#: rhodecode/templates/changeset/changeset_file_comment.html:86 -msgid "Hide" -msgstr "" +#, fuzzy +msgid "Cancel" +msgstr "修改" #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, fuzzy @@ -3537,20 +3677,16 @@ msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:137 -msgid "Leave a comment" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -msgid "Check this to change current status of code-review for this changeset" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:144 -#, fuzzy -msgid "change status" +#: rhodecode/templates/changeset/changeset_file_comment.html:86 +msgid "Hide" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#, fuzzy +msgid "Change status" msgstr "變更" -#: rhodecode/templates/changeset/changeset_file_comment.html:164 +#: rhodecode/templates/changeset/changeset_file_comment.html:163 msgid "Comment and close" msgstr "" @@ -3559,73 +3695,79 @@ msgid "%s Changesets" msgstr "變更" -#: rhodecode/templates/changeset/changeset_range.html:29 -#: rhodecode/templates/compare/compare_diff.html:29 -msgid "Compare View" -msgstr "比較顯示" - -#: rhodecode/templates/changeset/changeset_range.html:29 -#, fuzzy -msgid "Show combined compare" -msgstr "文件內容" - -#: rhodecode/templates/changeset/changeset_range.html:54 +#: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:19 -msgid "show full diff for this file" -msgstr "" - -#: rhodecode/templates/changeset/diff_block.html:27 -#, fuzzy -msgid "show inline comments" +#: rhodecode/templates/changeset/diff_block.html:22 +msgid "Show full diff for this file" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:30 +#, fuzzy +msgid "Show inline comments" msgstr "文件內容" -#: rhodecode/templates/compare/compare_cs.html:5 +#: rhodecode/templates/changeset/diff_block.html:55 +msgid "Show file at latest version in this repo" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:56 +msgid "Show file at initial version in this repo" +msgstr "" + +#: rhodecode/templates/compare/compare_cs.html:4 #, fuzzy msgid "No changesets" msgstr "尚未有任何變更" -#: rhodecode/templates/compare/compare_diff.html:37 -#: rhodecode/templates/pullrequests/pullrequest_show.html:87 +#: rhodecode/templates/compare/compare_cs.html:32 +#, fuzzy +msgid "Ancestor" +msgstr "分支" + +#: rhodecode/templates/compare/compare_diff.html:5 +#, fuzzy, python-format +msgid "%s Compare" +msgstr "比較顯示" + +#: rhodecode/templates/compare/compare_diff.html:9 +#, fuzzy +msgid "Compare revisions" +msgstr "前一個修訂" + +#: rhodecode/templates/compare/compare_diff.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:106 #, fuzzy, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "文件內容" -#: rhodecode/templates/compare/compare_diff.html:52 -#: rhodecode/templates/pullrequests/pullrequest_show.html:102 +#: rhodecode/templates/compare/compare_diff.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:121 #, fuzzy msgid "No files" msgstr "檔案" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 -msgid "Fork" -msgstr "分支" +#: rhodecode/templates/compare/compare_diff.html:58 +#: rhodecode/templates/compare/compare_diff.html:69 +msgid "confirm to show potentially huge diff" +msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:54 -#: rhodecode/templates/summary/summary.html:77 +#: rhodecode/templates/summary/summary.html:69 msgid "Mercurial repository" msgstr "Mercurial 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:56 -#: rhodecode/templates/summary/summary.html:80 +#: rhodecode/templates/summary/summary.html:72 msgid "Git repository" msgstr "Git 版本庫" -#: rhodecode/templates/data_table/_dt_elements.html:63 -#: rhodecode/templates/summary/summary.html:87 -msgid "public repository" -msgstr "公開版本庫" - #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/summary/summary.html:96 -#: rhodecode/templates/summary/summary.html:97 -msgid "Fork of" -msgstr "" +#, fuzzy, python-format +msgid "Fork of %s" +msgstr "fork 名稱" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3653,29 +3795,45 @@ msgid "Confirm to delete this user: %s" msgstr "確認刪除這個使用者" -#: rhodecode/templates/email_templates/changeset_comment.html:10 -#, fuzzy -msgid "New status$" +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:15 +#, fuzzy +msgid "New status" msgstr "變更" +#: rhodecode/templates/email_templates/changeset_comment.html:11 +#: rhodecode/templates/email_templates/pull_request_comment.html:9 +msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:14 +#, fuzzy +msgid "Repo" +msgstr "空的版本庫" + +#: rhodecode/templates/email_templates/changeset_comment.html:16 +msgid "desc" +msgstr "" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is a notification from RhodeCode." msgstr "" #: rhodecode/templates/email_templates/password_reset.html:4 -msgid "Hello" +#, python-format +msgid "Hello %s" +msgstr "" + +#: rhodecode/templates/email_templates/password_reset.html:5 +msgid "We received a request to create a new password for your account." msgstr "" #: rhodecode/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." -msgstr "" - -#: rhodecode/templates/email_templates/password_reset.html:8 msgid "You can generate it by clicking following URL" msgstr "" -#: rhodecode/templates/email_templates/password_reset.html:12 -msgid "If you didn't request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:11 +msgid "If you did not request new password please ignore this email." msgstr "" #: rhodecode/templates/email_templates/pull_request.html:4 @@ -3687,37 +3845,32 @@ #: rhodecode/templates/email_templates/pull_request.html:5 #, fuzzy +msgid "View this pull request here" +msgstr "確認移除這個版本庫" + +#: rhodecode/templates/email_templates/pull_request.html:6 +#, fuzzy msgid "title" msgstr "寫" -#: rhodecode/templates/email_templates/pull_request.html:6 -#: rhodecode/templates/pullrequests/pullrequest.html:115 +#: rhodecode/templates/email_templates/pull_request.html:7 #, fuzzy msgid "description" msgstr "描述" -#: rhodecode/templates/email_templates/pull_request.html:7 -#, fuzzy -msgid "View this pull request here" -msgstr "確認移除這個版本庫" - #: rhodecode/templates/email_templates/pull_request.html:12 msgid "revisions for reviewing" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:3 #, fuzzy, python-format -msgid "User %s commented on pull request #%s for repository %s" +msgid "Pull request #%s for repository %s" msgstr "建立使用者 %s" -#: rhodecode/templates/email_templates/pull_request_comment.html:10 -#, fuzzy -msgid "New status" -msgstr "變更" - -#: rhodecode/templates/email_templates/pull_request_comment.html:14 -msgid "View this comment here" -msgstr "" +#: rhodecode/templates/email_templates/pull_request_comment.html:13 +#, fuzzy +msgid "Closing pull request with status" +msgstr "建立使用者 %s" #: rhodecode/templates/email_templates/registration.html:4 #, fuzzy @@ -3728,116 +3881,119 @@ msgid "View this user here" msgstr "" -#: rhodecode/templates/errors/error_document.html:46 +#: rhodecode/templates/errors/error_document.html:55 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "" #: rhodecode/templates/files/file_diff.html:4 #, fuzzy, python-format -msgid "%s File diff" +msgid "%s File Diff" msgstr "檔案差異" -#: rhodecode/templates/files/file_diff.html:12 +#: rhodecode/templates/files/file_diff.html:8 msgid "File diff" msgstr "檔案差異" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:74 +#: rhodecode/templates/files/files.html:76 #, fuzzy, python-format -msgid "%s files" +msgid "%s Files" msgstr "檔案" -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:351 -msgid "files" -msgstr "檔案" +#: rhodecode/templates/files/files.html:30 +#: rhodecode/templates/files/files_add.html:31 +#: rhodecode/templates/files/files_edit.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +#, fuzzy +msgid "Branch" +msgstr "分支" #: rhodecode/templates/files/files_add.html:4 -#: rhodecode/templates/files/files_edit.html:4 #, fuzzy, python-format -msgid "%s Edit file" -msgstr "編輯檔案" +msgid "%s Files Add" +msgstr "檔案" #: rhodecode/templates/files/files_add.html:19 #, fuzzy -msgid "add file" +msgid "Add file" msgstr "編輯檔案" -#: rhodecode/templates/files/files_add.html:40 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:78 #, fuzzy msgid "Add new file" msgstr "新增使用者" -#: rhodecode/templates/files/files_add.html:45 +#: rhodecode/templates/files/files_add.html:43 #, fuzzy msgid "File Name" msgstr "檔案名稱" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:56 #, fuzzy msgid "or" msgstr "時" -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:54 +#: rhodecode/templates/files/files_add.html:47 +#: rhodecode/templates/files/files_add.html:52 #, fuzzy msgid "Upload file" msgstr "編輯檔案" -#: rhodecode/templates/files/files_add.html:58 +#: rhodecode/templates/files/files_add.html:56 #, fuzzy msgid "Create new file" msgstr "建立使用者 %s" -#: rhodecode/templates/files/files_add.html:63 -#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_add.html:61 +#: rhodecode/templates/files/files_edit.html:37 #: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "位置" -#: rhodecode/templates/files/files_add.html:67 +#: rhodecode/templates/files/files_add.html:65 msgid "use / to separate directories" msgstr "" -#: rhodecode/templates/files/files_add.html:77 -#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 #: rhodecode/templates/shortlog/shortlog_data.html:6 -msgid "commit message" +#, fuzzy +msgid "Commit message" msgstr "遞交資訊" -#: rhodecode/templates/files/files_add.html:81 -#: rhodecode/templates/files/files_edit.html:67 +#: rhodecode/templates/files/files_add.html:79 +#: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "遞交修改" #: rhodecode/templates/files/files_browser.html:13 -msgid "view" +#, fuzzy +msgid "View" msgstr "顯示" #: rhodecode/templates/files/files_browser.html:14 -msgid "previous revision" +#, fuzzy +msgid "Previous revision" msgstr "前一個修訂" #: rhodecode/templates/files/files_browser.html:16 -msgid "next revision" +#, fuzzy +msgid "Next revision" msgstr "下一個修訂" #: rhodecode/templates/files/files_browser.html:23 -msgid "follow current branch" +msgid "Follow current branch" msgstr "" #: rhodecode/templates/files/files_browser.html:27 -msgid "search file list" +#, fuzzy +msgid "Search file list" msgstr "搜尋檔案列表" -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -#, fuzzy -msgid "add new file" -msgstr "新增使用者" - #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." msgstr "載入檔案列表..." @@ -3863,32 +4019,41 @@ msgid "Last committer" msgstr "最後的遞交者" +#: rhodecode/templates/files/files_edit.html:4 +#, fuzzy, python-format +msgid "%s Files Edit" +msgstr "檔案" + #: rhodecode/templates/files/files_edit.html:19 -msgid "edit file" +#, fuzzy +msgid "Edit file" msgstr "編輯檔案" -#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -msgid "show annotation" +#, fuzzy +msgid "Show annotation" msgstr "險是註釋" -#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_edit.html:48 #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 -msgid "show as raw" +#, fuzzy +msgid "Show as raw" msgstr "顯示原始文件" -#: rhodecode/templates/files/files_edit.html:51 +#: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -msgid "download as raw" +#, fuzzy +msgid "Download as raw" msgstr "下載原始文件" -#: rhodecode/templates/files/files_edit.html:54 -#, fuzzy -msgid "source" +#: rhodecode/templates/files/files_edit.html:52 +#, fuzzy +msgid "Source" msgstr "顯示原始碼" -#: rhodecode/templates/files/files_edit.html:59 +#: rhodecode/templates/files/files_edit.html:57 #, fuzzy msgid "Editing file" msgstr "編輯檔案" @@ -3899,17 +4064,17 @@ #: rhodecode/templates/files/files_history_box.html:9 #, fuzzy -msgid "diff to revision" +msgid "Diff to revision" msgstr "下一個修訂" #: rhodecode/templates/files/files_history_box.html:10 #, fuzzy -msgid "show at revision" +msgid "Show at revision" msgstr "下一個修訂" #: rhodecode/templates/files/files_history_box.html:11 #, fuzzy -msgid "show full history" +msgid "Show full history" msgstr "載入檔案列表..." #: rhodecode/templates/files/files_history_box.html:16 @@ -3924,17 +4089,19 @@ msgstr "載入檔案列表..." #: rhodecode/templates/files/files_source.html:21 -msgid "show source" +#, fuzzy +msgid "Show source" msgstr "顯示原始碼" #: rhodecode/templates/files/files_source.html:29 #, fuzzy, python-format -msgid "edit on branch:%s" +msgid "Edit on branch:%s" msgstr "刪除版本庫 %s" #: rhodecode/templates/files/files_source.html:31 -msgid "edit on branch:?" -msgstr "" +#, fuzzy +msgid "Edit on branch:?" +msgstr "刪除版本庫 %s" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -3967,8 +4134,10 @@ msgid "%s Followers" msgstr "追蹤者" -#: rhodecode/templates/followers/followers.html:13 -msgid "followers" +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:184 +msgid "Followers" msgstr "追蹤者" #: rhodecode/templates/followers/followers_data.html:12 @@ -3981,33 +4150,34 @@ msgid "%s Fork" msgstr "分支" -#: rhodecode/templates/forks/fork.html:31 +#: rhodecode/templates/forks/fork.html:28 msgid "Fork name" msgstr "分支名稱" -#: rhodecode/templates/forks/fork.html:68 +#: rhodecode/templates/forks/fork.html:65 msgid "Private" msgstr "私有" -#: rhodecode/templates/forks/fork.html:77 +#: rhodecode/templates/forks/fork.html:74 #, fuzzy msgid "Copy permissions" msgstr "權限" -#: rhodecode/templates/forks/fork.html:81 +#: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" msgstr "" -#: rhodecode/templates/forks/fork.html:86 +#: rhodecode/templates/forks/fork.html:84 msgid "Update after clone" msgstr "" -#: rhodecode/templates/forks/fork.html:90 +#: rhodecode/templates/forks/fork.html:88 msgid "Checkout source after making a clone" msgstr "" -#: rhodecode/templates/forks/fork.html:94 -msgid "fork this repository" +#: rhodecode/templates/forks/fork.html:93 +#, fuzzy +msgid "Fork this repository" msgstr "fork 這個版本庫" #: rhodecode/templates/forks/forks.html:5 @@ -4015,18 +4185,17 @@ msgid "%s Forks" msgstr "分支" -#: rhodecode/templates/forks/forks.html:13 -msgid "forks" -msgstr "分支" +#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/summary/summary.html:189 +#: rhodecode/templates/summary/summary.html:190 +msgid "Forks" +msgstr "" #: rhodecode/templates/forks/forks_data.html:17 -msgid "forked" +#, fuzzy +msgid "Forked" msgstr "已建立分支" -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "" - #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "尚未有任何 fork" @@ -4042,21 +4211,15 @@ msgstr "%s 公開日誌 %s feed" #: rhodecode/templates/journal/journal.html:32 -#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" #: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 -msgid "RSS feed" -msgstr "" - -#: rhodecode/templates/journal/journal.html:38 -#: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:51 #, fuzzy msgid "Watched" msgstr "快取" @@ -4065,6 +4228,11 @@ msgid "No entries yet" msgstr "" +#: rhodecode/templates/journal/public_journal.html:4 +#: rhodecode/templates/journal/public_journal.html:21 +msgid "Public Journal" +msgstr "開放日誌" + #: rhodecode/templates/journal/public_journal.html:13 #, fuzzy msgid "ATOM public journal feed" @@ -4075,162 +4243,139 @@ msgid "RSS public journal feed" msgstr "%s 公開日誌 %s feed" -#: rhodecode/templates/journal/public_journal.html:21 -msgid "Public Journal" -msgstr "開放日誌" - #: rhodecode/templates/pullrequests/pullrequest.html:4 -#: rhodecode/templates/pullrequests/pullrequest.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:54 -msgid "refresh overview" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:52 #, fuzzy msgid "Detailed compare view" msgstr "比較顯示" -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:118 +#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 #, fuzzy msgid "owner" msgstr "擁有者" -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:145 +#: rhodecode/templates/pullrequests/pullrequest.html:77 msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:97 +#: rhodecode/templates/pullrequests/pullrequest.html:83 #, fuzzy msgid "Create new pull request" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest.html:92 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 #, fuzzy msgid "Title" msgstr "寫" -#: rhodecode/templates/pullrequests/pullrequest.html:123 +#: rhodecode/templates/pullrequests/pullrequest.html:109 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "Closed %s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "with status %s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:31 -#, fuzzy -msgid "Status" +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#, fuzzy, python-format +msgid "%s Pull Request #%s" +msgstr "建立使用者 %s" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#, fuzzy +msgid "Review status" msgstr "變更" -#: rhodecode/templates/pullrequests/pullrequest_show.html:36 +#: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 -msgid "pull request was reviewed by all reviewers" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:56 +#: rhodecode/templates/pullrequests/pullrequest_show.html:59 +msgid "Pull request was reviewed by all reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Origin repository" msgstr "Git 版本庫" -#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 #, fuzzy msgid "Created on" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:83 +#: rhodecode/templates/pullrequests/pullrequest_show.html:102 #, fuzzy msgid "Compare view" msgstr "比較顯示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:130 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 #, fuzzy msgid "reviewer" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:164 +#, fuzzy +msgid "Add or remove reviewer to this pull request." +msgstr "確認移除這個版本庫" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:168 +#, fuzzy +msgid "Save changes" +msgstr "沒有修改" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -#, fuzzy -msgid "all pull requests" +#, fuzzy, python-format +msgid "%s Pull Requests" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 -msgid "All pull requests" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 -msgid "Closed" -msgstr "" - #: rhodecode/templates/search/search.html:6 -#, fuzzy, python-format -msgid "Search \"%s\" in repository: %s" +#, fuzzy +msgid "Search repository" msgstr "於版本庫:" #: rhodecode/templates/search/search.html:8 -#, fuzzy, python-format -msgid "Search \"%s\" in all repositories" -msgstr "於所有的版本庫" - -#: rhodecode/templates/search/search.html:12 -#: rhodecode/templates/search/search.html:32 -#, fuzzy, python-format -msgid "Search in repository: %s" -msgstr "於版本庫:" - -#: rhodecode/templates/search/search.html:14 -#: rhodecode/templates/search/search.html:34 +#: rhodecode/templates/search/search.html:16 #, fuzzy msgid "Search in all repositories" msgstr "於所有的版本庫" -#: rhodecode/templates/search/search.html:48 +#: rhodecode/templates/search/search.html:50 msgid "Search term" msgstr "搜尋關鍵字" -#: rhodecode/templates/search/search.html:60 +#: rhodecode/templates/search/search.html:62 msgid "Search in" msgstr "搜尋範圍" -#: rhodecode/templates/search/search.html:63 +#: rhodecode/templates/search/search.html:65 msgid "File contents" msgstr "文件內容" -#: rhodecode/templates/search/search.html:64 +#: rhodecode/templates/search/search.html:66 #, fuzzy msgid "Commit messages" msgstr "遞交資訊" -#: rhodecode/templates/search/search.html:65 +#: rhodecode/templates/search/search.html:67 msgid "File names" msgstr "檔案名稱" @@ -4240,42 +4385,25 @@ msgid "Permission denied" msgstr "權限不足" -#: rhodecode/templates/settings/repo_settings.html:5 -#, fuzzy, python-format -msgid "%s Settings" -msgstr "設定" - -#: rhodecode/templates/settings/repo_settings.html:102 -#, fuzzy -msgid "Delete repository" -msgstr "刪除版本庫 %s" - -#: rhodecode/templates/settings/repo_settings.html:109 -#, fuzzy -msgid "Remove repo" -msgstr "移除" - #: rhodecode/templates/shortlog/shortlog.html:5 #, fuzzy, python-format -msgid "%s Shortlog" -msgstr "簡短紀錄" - +msgid "%s Lightweight Changelog" +msgstr "檔案修改" + +#: rhodecode/templates/shortlog/shortlog.html:11 #: rhodecode/templates/shortlog/shortlog.html:15 -#: rhodecode/templates/shortlog/shortlog.html:19 -msgid "shortlog" -msgstr "簡短紀錄" - -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "修訂" +msgid "Lightweight Changelog" +msgstr "" #: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "age" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "作者" +#, fuzzy +msgid "Age" +msgstr "標籤" + +#: rhodecode/templates/shortlog/shortlog_data.html:20 +#, python-format +msgid "Click to open associated pull request #%s" +msgstr "" #: rhodecode/templates/shortlog/shortlog_data.html:75 msgid "Add or upload files directly via RhodeCode" @@ -4295,162 +4423,175 @@ msgid "%s Summary" msgstr "概況" -#: rhodecode/templates/summary/summary.html:12 -msgid "summary" -msgstr "概況" - -#: rhodecode/templates/summary/summary.html:20 -#, fuzzy, python-format -msgid "repo %s ATOM feed" -msgstr "訂閱 %s atom" - -#: rhodecode/templates/summary/summary.html:21 +#: rhodecode/templates/summary/summary.html:16 #, fuzzy, python-format -msgid "repo %s RSS feed" +msgid "%s ATOM feed" +msgstr "訂閱 %s atom" + +#: rhodecode/templates/summary/summary.html:17 +#, fuzzy, python-format +msgid "%s RSS feed" msgstr "訂閱 %s rss" -#: rhodecode/templates/summary/summary.html:49 -#: rhodecode/templates/summary/summary.html:52 -#, fuzzy -msgid "ATOM" -msgstr "作者" - -#: rhodecode/templates/summary/summary.html:70 +#: rhodecode/templates/summary/summary.html:62 #, fuzzy, python-format msgid "Repository locked by %s" msgstr "個版本庫" -#: rhodecode/templates/summary/summary.html:72 +#: rhodecode/templates/summary/summary.html:64 #, fuzzy msgid "Repository unlocked" msgstr "個版本庫" -#: rhodecode/templates/summary/summary.html:91 +#: rhodecode/templates/summary/summary.html:83 #, fuzzy, python-format msgid "Non changable ID %s" msgstr "沒有修改" -#: rhodecode/templates/summary/summary.html:96 -msgid "public" +#: rhodecode/templates/summary/summary.html:88 +#, fuzzy +msgid "Public" msgstr "公開" -#: rhodecode/templates/summary/summary.html:104 -msgid "remote clone" +#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:89 +msgid "Fork of" +msgstr "" + +#: rhodecode/templates/summary/summary.html:96 +#, fuzzy +msgid "Remote clone" msgstr "遠端複製" -#: rhodecode/templates/summary/summary.html:125 +#: rhodecode/templates/summary/summary.html:117 msgid "Contact" msgstr "聯絡方式" -#: rhodecode/templates/summary/summary.html:139 +#: rhodecode/templates/summary/summary.html:131 msgid "Clone url" msgstr "複製連結" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:136 #, fuzzy msgid "Show by Name" msgstr "顯示更多" -#: rhodecode/templates/summary/summary.html:143 +#: rhodecode/templates/summary/summary.html:137 msgid "Show by ID" msgstr "" -#: rhodecode/templates/summary/summary.html:151 +#: rhodecode/templates/summary/summary.html:143 #, fuzzy msgid "Trending files" msgstr "編輯檔案" -#: rhodecode/templates/summary/summary.html:159 -#: rhodecode/templates/summary/summary.html:175 -#: rhodecode/templates/summary/summary.html:203 +#: rhodecode/templates/summary/summary.html:151 +#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:232 msgid "enable" msgstr "啟用" -#: rhodecode/templates/summary/summary.html:167 +#: rhodecode/templates/summary/summary.html:159 msgid "Download" msgstr "下載" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:163 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:165 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: rhodecode/templates/summary/summary.html:179 +#: rhodecode/templates/summary/summary.html:171 #, fuzzy msgid "Download as zip" msgstr "下載原始文件" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:174 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:195 +#: rhodecode/templates/summary/summary.html:197 +#, fuzzy +msgid "Repository Size" +msgstr "個版本庫" + +#: rhodecode/templates/summary/summary.html:204 +#: rhodecode/templates/summary/summary.html:206 +#, fuzzy +msgid "Feed" +msgstr "已建立分支" + +#: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:206 +#: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:227 -msgid "Shortlog" -msgstr "簡短紀錄" - -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:256 +#, fuzzy +msgid "Latest changes" +msgstr "最後修改" + +#: rhodecode/templates/summary/summary.html:258 #, fuzzy msgid "Quick start" msgstr "快速過濾..." -#: rhodecode/templates/summary/summary.html:243 +#: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:246 +#: rhodecode/templates/summary/summary.html:275 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:304 +#: rhodecode/templates/summary/summary.html:333 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: rhodecode/templates/summary/summary.html:661 +#: rhodecode/templates/summary/summary.html:380 +msgid "files" +msgstr "檔案" + +#: rhodecode/templates/summary/summary.html:690 msgid "commits" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:662 +#: rhodecode/templates/summary/summary.html:691 msgid "files added" msgstr "多個檔案新增" -#: rhodecode/templates/summary/summary.html:663 +#: rhodecode/templates/summary/summary.html:692 msgid "files changed" msgstr "多個檔案修改" -#: rhodecode/templates/summary/summary.html:664 +#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "移除多個檔案" -#: rhodecode/templates/summary/summary.html:667 +#: rhodecode/templates/summary/summary.html:695 msgid "commit" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:668 +#: rhodecode/templates/summary/summary.html:696 msgid "file added" msgstr "檔案新增" -#: rhodecode/templates/summary/summary.html:669 +#: rhodecode/templates/summary/summary.html:697 msgid "file changed" msgstr "檔案修改" -#: rhodecode/templates/summary/summary.html:670 +#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "移除檔案" @@ -4459,7 +4600,7 @@ msgid "%s Tags" msgstr "之前" -#: rhodecode/templates/tags/tags.html:29 +#: rhodecode/templates/tags/tags.html:26 #, fuzzy msgid "Compare tags" msgstr "比較顯示"